merged from debian-sid

130 files changed, 23236 insertions, 15349 deletions

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index f9bbb8298..000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-autom4te.cache
-aclocal.m4
-configure
-build
diff --git a/COPYING b/COPYING
index 3baf9ac5a..c0e89b51a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,142 +1,23 @@
 Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others.
+Apt is currently developed by APT Development Team <deity@lists.debian.org>.
 
-Apt is licensed under the terms of the GNU General Public License (GPL),
-version 2.0 or later, as published by the Free Software Foundation.  See
-the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or
-<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
-of the GNU General Public License.
-
-In addition, prior to November 15th, 2000, apt may be distributed under
-terms identical to the above with the following addition:
-
-Works using apt may link against the GUI library "libqt", copyright by
-Troll Tech AS, Norway, provided that:
-
-1. The version of "libqt" is licensed under the terms of the "Qt Free Edition
-   License" published by Troll Tech AS.  The license terms identified as
-   the Qt Free Edition License below are the only such terms under which
-   distribution of works derived from both apt and "libqt" are permitted;
-
-and
-
-2. The source code of the version of "libqt" used is
-
-   a) Distributed with the binary version;
-
-   or
-
-   b) Downloadable by anyone, without fee, using a publicly-announced
-      URL on the Internet, for a duration of at least three years
-      starting with distribution of the binary version.
-
-On and after November 15th, 2000, the above additional terms lose all
-force, and apt will be licensed only under the terms of the GNU General
-Public License, version 2.0 or later.
-
-      _______________________________________________________________
-
-The following text, up to the text of the Qt Free Edition License, is
-informational and not part of the license terms on apt.
-
-Modifications to apt in either source or compiled form must be licensed
-under the terms of the GNU General Public License, version 2.0 (or later),
-but need not include the above clause permitting usage of the "libqt"
-library under the Qt Free Edition License.  Note that removal of this
-clause will result in software which is not licensed for binary
-redistribution linked against software governed by the Qt Free Edition
-License.  In the event that a version of "libqt" is released that is
-licensed under terms that do not conflict with the GPL, the additional
-clause above is not required to grant permission for distribution of works
-that are derived from both apt and "libqt".
-
-No part of apt is licensed under the Qt Free Edition License.  The terms
-below are provided to help identify the circumstances under which the
-"libqt" library may be used with apt (or a work derived from both).  The
-terms below are copied from the LICENSE file of the qt-1.44 distribution,
-as of November 10th, 1999.
-
-      _______________________________________________________________
-
-                        QT FREE EDITION LICENSE
+License: GPLv2+
 
-Copyright (C) 1992-1999 Troll Tech AS. All rights reserved. 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-This is the license for Qt Free Edition version 1.44; it covers private use,
-use of third-party application programs based on Qt, and development of
-free software for the free software community. 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-                      COPYRIGHT AND RESTRICTIONS
-
-The Qt toolkit is a product of Troll Tech AS. The Qt Free Edition is limited
-to use with the X Window System. 
-
-You may copy this version of the Qt Free Edition provided that the entire
-archive is distributed unchanged and as a whole, including this notice. 
-
-You may use this version of the Qt Free Edition to compile, link and run
-application programs legally developed by third parties. 
-
-You may use the Qt Free Edition to create application programs
-provided that: 
-
-      You accept this license. 
-      Your software does not require modifications to Qt Free Edition.
-      You satisfy ONE of the following three requirements 
-      EITHER 
-            Users of your software can freely obtain source code for the
-            software, freely modify the source code (possibly with
-            restrictions on copyright notices, attributions and legal
-            responsibility), and freely redistribute original or modified
-            versions of the software. 
-      OR 
-            Your software is distributed under the GNU GENERAL
-            PUBLIC LICENSE, version 2 or later, as defined by the
-            Free Software Foundation. 
-      OR 
-            Your software is distributed under the GNU LIBRARY
-            GENERAL PUBLIC LICENSE, version 2 or later, as
-            defined by the Free Software Foundation. 
-
-If you are paid to develop something with Qt Free Edition or it is a part of
-your job the following conditions also apply: 
-
-      Your software must not require libraries, programs, data or
-      documentation that are not available outside your organization in
-      order to compile or use. 
-      If and when your organization starts using the software, you must
-      notify Troll Tech AS of the following: 
-            Your organization's name and purpose. 
-            The software's name and purpose. 
-            The software's license. 
-            That your organization considers the software to be free
-            software. 
-
-You may also use the Qt Free Edition to create reusable components
-(such as libraries) provided that you accept the terms above, and in
-addition that: 
-
-      Your components' license includes the following text: 
-
-            [Your package] requires the Qt library, which is
-            copyright Troll Tech AS. Freely distributable
-            programs may generally use Qt Free Edition free of
-            charge, see [README.QT] for details. 
-
-      README.QT is distributed along with your components. 
-      Qt Free Edition is not distributed as an integral part of your
-      components. 
-
-                       LIMITATIONS OF LIABILITY
-
-Troll Tech AS makes no obligation under this license to support or
-upgrade Qt Free Edition, or assist in the use of Qt Free Edition. 
-
-In no event shall Troll Tech AS be liable for any lost revenue or profits or
-other direct, indirect, special, incidental or consequential damages, even
-if Troll Tech has been advised of the possibility of such damages. 
+See /usr/share/common-licenses/GPL-2, or
+<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+of the GNU General Public License.
 
-QT FREE EDITION IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND,
-INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE.
-      _______________________________________________________________
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index a1fb97b48..7c85f2e86 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -111,7 +111,7 @@ bool ARArchive::LoadHeaders()
       else
       {
 	 unsigned int I = sizeof(Head.Name) - 1;
-	 for (; Head.Name[I] == ' '; I--);
+	 for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--);
 	 Memb->Name = string(Head.Name,I+1);
       }
 
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 09ea5da02..39ae327cb 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -131,9 +131,7 @@ void pkgAcquire::Item::Rename(string From,string To)
    }   
 }
 									/*}}}*/
-
-
-// AcqDiffIndex::AcqDiffIndex - Constructor			
+// AcqDiffIndex::AcqDiffIndex - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* Get the DiffIndex file first and see if there are patches availabe 
  * If so, create a pkgAcqIndexDiffs fetcher that will get and apply the
@@ -184,7 +182,7 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
    QueueURI(Desc);
 
 }
-
+									/*}}}*/
 // AcqIndex::Custom600Headers - Insert custom request headers		/*{{{*/
 // ---------------------------------------------------------------------
 /* The only header we use is the last-modified header. */
@@ -202,9 +200,8 @@ string pkgAcqDiffIndex::Custom600Headers()
    
    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
-
-
-bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
+									/*}}}*/
+bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)		/*{{{*/
 {
    if(Debug)
       std::clog << "pkgAcqIndexDiffs::ParseIndexDiff() " << IndexDiffFile 
@@ -291,8 +288,8 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
       std::clog << "Can't find a patch in the index file" << std::endl;
    return false;
 }
-
-void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+									/*}}}*/
+void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)	/*{{{*/
 {
    if(Debug)
       std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << std::endl
@@ -305,8 +302,8 @@ void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
    Status = StatDone;
    Dequeue();
 }
-
-void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash,
+									/*}}}*/
+void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash,	/*{{{*/
 			   pkgAcquire::MethodConfig *Cnf)
 {
    if(Debug)
@@ -335,10 +332,8 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash,
    Dequeue();
    return;
 }
-
-
-
-// AcqIndexDiffs::AcqIndexDiffs - Constructor			
+									/*}}}*/
+// AcqIndexDiffs::AcqIndexDiffs - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* The package diff is added to the queue. one object is constructed
  * for each diff and the index
@@ -372,9 +367,8 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
       QueueNextDiff();
    }
 }
-
-
-void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+									/*}}}*/
+void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf)	/*{{{*/
 {
    if(Debug)
       std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << std::endl
@@ -383,9 +377,8 @@ void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 		   ExpectedHash);
    Finish();
 }
-
-
-// helper that cleans the item out of the fetcher queue
+									/*}}}*/
+// Finish - helper that cleans the item out of the fetcher queue	/*{{{*/
 void pkgAcqIndexDiffs::Finish(bool allDone)
 {
    // we restore the original name, this is required, otherwise
@@ -420,10 +413,8 @@ void pkgAcqIndexDiffs::Finish(bool allDone)
    Dequeue();
    return;
 }
-
-
-
-bool pkgAcqIndexDiffs::QueueNextDiff()
+									/*}}}*/
+bool pkgAcqIndexDiffs::QueueNextDiff()					/*{{{*/
 {
 
    // calc sha1 of the just patched file
@@ -469,10 +460,8 @@ bool pkgAcqIndexDiffs::QueueNextDiff()
 
    return true;
 }
-
-
-
-void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,
+									/*}}}*/
+void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,	/*{{{*/
 			    pkgAcquire::MethodConfig *Cnf)
 {
    if(Debug)
@@ -543,8 +532,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,
 	 return Finish(true);
    }
 }
-
-
+									/*}}}*/
 // AcqIndex::AcqIndex - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* The package file is added to the queue and a second class is 
@@ -594,8 +582,7 @@ string pkgAcqIndex::Custom600Headers()
    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
 									/*}}}*/
-
-void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)	/*{{{*/
 {
    bool descChanged = false;
    // no .bz2 found, retry with .gz
@@ -630,8 +617,7 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 
    Item::Failed(Message,Cnf);
 }
-
-
+									/*}}}*/
 // AcqIndex::Done - Finished a fetch					/*{{{*/
 // ---------------------------------------------------------------------
 /* This goes through a number of states.. On the initial fetch the
@@ -735,7 +721,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
    QueueURI(Desc);
    Mode = decompProg;
 }
-
+									/*}}}*/
 // AcqIndexTrans::pkgAcqIndexTrans - Constructor			/*{{{*/
 // ---------------------------------------------------------------------
 /* The Translation file is added to the queue */
@@ -744,7 +730,6 @@ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner,
   : pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, HashString(), "")
 {
 }
-
 									/*}}}*/
 // AcqIndexTrans::Failed - Silence failure messages for missing files	/*{{{*/
 // ---------------------------------------------------------------------
@@ -764,8 +749,7 @@ void pkgAcqIndexTrans::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
    Item::Failed(Message,Cnf);
 }
 									/*}}}*/
-
-pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
+pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,				/*{{{*/
 			     string URI,string URIDesc,string ShortDesc,
 			     string MetaIndexURI, string MetaIndexURIDesc,
 			     string MetaIndexShortDesc,
@@ -854,7 +838,7 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5,
 
 }
 									/*}}}*/
-void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
 {
    string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
 
@@ -890,8 +874,8 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
    
    Item::Failed(Message,Cnf);
 }
-
-pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,
+									/*}}}*/
+pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,			/*{{{*/
 				 string URI,string URIDesc,string ShortDesc,
 				 string SigFile,
 				 const vector<struct IndexTarget*>* IndexTargets,
@@ -910,7 +894,6 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,
 
    QueueURI(Desc);
 }
-
 									/*}}}*/
 // pkgAcqMetaIndex::Custom600Headers - Insert custom request headers	/*{{{*/
 // ---------------------------------------------------------------------
@@ -926,8 +909,8 @@ string pkgAcqMetaIndex::Custom600Headers()
    
    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
-
-void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash,
+									/*}}}*/
+void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash,	/*{{{*/
 			   pkgAcquire::MethodConfig *Cfg)
 {
    Item::Done(Message,Size,Hash,Cfg);
@@ -968,8 +951,8 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash,
       }
    }
 }
-
-void pkgAcqMetaIndex::RetrievalDone(string Message)
+									/*}}}*/
+void pkgAcqMetaIndex::RetrievalDone(string Message)			/*{{{*/
 {
    // We have just finished downloading a Release file (it is not
    // verified yet)
@@ -1007,8 +990,8 @@ void pkgAcqMetaIndex::RetrievalDone(string Message)
    chmod(FinalFile.c_str(),0644);
    DestFile = FinalFile;
 }
-
-void pkgAcqMetaIndex::AuthDone(string Message)
+									/*}}}*/
+void pkgAcqMetaIndex::AuthDone(string Message)				/*{{{*/
 {
    // At this point, the gpgv method has succeeded, so there is a
    // valid signature from a key in the trusted keyring.  We
@@ -1041,8 +1024,8 @@ void pkgAcqMetaIndex::AuthDone(string Message)
    Rename(SigFile,VerifiedSigFile);
    chmod(VerifiedSigFile.c_str(),0644);
 }
-
-void pkgAcqMetaIndex::QueueIndexes(bool verify)
+									/*}}}*/
+void pkgAcqMetaIndex::QueueIndexes(bool verify)				/*{{{*/
 {
    for (vector <struct IndexTarget*>::const_iterator Target = IndexTargets->begin();
         Target != IndexTargets->end();
@@ -1084,8 +1067,8 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)
 			    (*Target)->ShortDesc, ExpectedIndexHash);
    }
 }
-
-bool pkgAcqMetaIndex::VerifyVendor(string Message)
+									/*}}}*/
+bool pkgAcqMetaIndex::VerifyVendor(string Message)			/*{{{*/
 {
 //    // Maybe this should be made available from above so we don't have
 //    // to read and parse it every time?
@@ -1171,9 +1154,8 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message)
 
    return true;
 }
-       								/*}}}*/
-// pkgAcqMetaIndex::Failed - no Release file present or no signature
-//      file present	                                        /*{{{*/
+									/*}}}*/
+// pkgAcqMetaIndex::Failed - no Release file present or no signature file present	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
@@ -1210,9 +1192,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
    // back to queueing Packages files without verification
    QueueIndexes(false);
 }
-
 									/*}}}*/
-
 // AcqArchive::AcqArchive - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* This just sets up the initial fetch environment and queues the first
@@ -1495,14 +1475,13 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
    }
 }
 									/*}}}*/
-// AcqArchive::IsTrusted - Determine whether this archive comes from a
-// trusted source							/*{{{*/
+// AcqArchive::IsTrusted - Determine whether this archive comes from a trusted source /*{{{*/
 // ---------------------------------------------------------------------
 bool pkgAcqArchive::IsTrusted()
 {
    return Trusted;
 }
-
+									/*}}}*/
 // AcqArchive::Finished - Fetching has finished, tidy up		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -1514,7 +1493,6 @@ void pkgAcqArchive::Finished()
    StoreFilename = string();
 }
 									/*}}}*/
-
 // AcqFile::pkgAcqFile - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* The file is added to the queue */
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index a48f7f7e5..36a926a0f 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -34,7 +34,7 @@
  *  \file acquire-item.h
  */
 
-/** \brief Represents the process by which a pkgAcquire object should
+/** \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
@@ -261,8 +261,8 @@ class pkgAcquire::Item
     */
    virtual ~Item();
 };
-
-/** \brief Information about an index patch (aka diff). */
+									/*}}}*/
+/** \brief Information about an index patch (aka diff). */		/*{{{*/
 struct DiffInfo {
    /** The filename of the diff. */
    string file;
@@ -273,8 +273,8 @@ struct DiffInfo {
    /** The size of the diff. */
    unsigned long size;
 };
-
-/** \brief An item that is responsible for fetching an index file of
+									/*}}}*/
+/** \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
@@ -348,8 +348,8 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
    pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc,
 		   string ShortDesc, HashString ExpectedHash);
 };
-
-/** \brief An item that is responsible for fetching all the patches
+									/*}}}*/
+/** \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
@@ -477,8 +477,8 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
 		    string ShortDesc, HashString ExpectedHash,
 		    vector<DiffInfo> diffs=vector<DiffInfo>());
 };
-
-/** \brief An acquire item that is responsible for fetching an index
+									/*}}}*/
+/** \brief An acquire item that is responsible for fetching an index	{{{
  *  file (e.g., Packages or Sources).
  *
  *  \sa pkgAcqDiffIndex, pkgAcqIndexDiffs, pkgAcqIndexTrans
@@ -545,8 +545,8 @@ class pkgAcqIndex : public pkgAcquire::Item
    pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc,
 	       string ShortDesc, HashString ExpectedHash, string compressExt="");
 };
-
-/** \brief An acquire item that is responsible for fetching a
+									/*}}}*/
+/** \brief An acquire item that is responsible for fetching a		{{{
  *  translated index file.
  *
  *  The only difference from pkgAcqIndex is that transient failures
@@ -579,8 +579,8 @@ class pkgAcqIndexTrans : public pkgAcqIndex
    pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc,
 		    string ShortDesc);
 };
-
-/** \brief Information about an index file. */
+									/*}}}*/
+/** \brief Information about an index file. */				/*{{{*/
 struct IndexTarget
 {
    /** \brief A URI from which the index file can be downloaded. */
@@ -597,8 +597,8 @@ struct IndexTarget
     */
    string MetaKey;
 };
-
-/** \brief An acquire item that downloads the detached signature
+									/*}}}*/
+/** \brief An acquire item that downloads the detached signature	{{{
  *  of a meta-index (Release) file, then queues up the release
  *  file itself.
  *
@@ -660,8 +660,8 @@ class pkgAcqMetaSig : public pkgAcquire::Item
 		 const vector<struct IndexTarget*>* IndexTargets,
 		 indexRecords* MetaIndexParser);
 };
-
-/** \brief An item that is responsible for downloading the meta-index
+									/*}}}*/
+/** \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
@@ -756,8 +756,8 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
 		   const vector<struct IndexTarget*>* IndexTargets,
 		   indexRecords* MetaIndexParser);
 };
-
-/** \brief An item that is responsible for fetching a package file.
+									/*}}}*/
+/** \brief An item that is responsible for fetching a package file.	{{{
  *
  *  If the package file already exists in the cache, nothing will be
  *  done.
@@ -840,8 +840,8 @@ class pkgAcqArchive : public pkgAcquire::Item
 		 pkgRecords *Recs,pkgCache::VerIterator const &Version,
 		 string &StoreFilename);
 };
-
-/** \brief Retrieve an arbitrary 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
@@ -902,7 +902,7 @@ class pkgAcqFile : public pkgAcquire::Item
 	      string Desc, string ShortDesc,
 	      const string &DestDir="", const string &DestFilename="");
 };
-
+									/*}}}*/
 /** @} */
 
 #endif
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index acf1156dc..fe066741c 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -446,7 +446,6 @@ void pkgAcqMethod::Status(const char *Format,...)
       exit(100);
 }
 									/*}}}*/
-
 // AcqMethod::Redirect - Send a redirect message                       /*{{{*/
 // ---------------------------------------------------------------------
 /* This method sends the redirect message and also manipulates the queue
@@ -478,7 +477,6 @@ void pkgAcqMethod::Redirect(const string &NewURI)
       QueueBack = I->Next;
 }
                                                                         /*}}}*/
-
 // AcqMethod::FetchResult::FetchResult - Constructor			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index bafba337e..74510ae21 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -266,7 +266,7 @@ pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access)
       return 0;
 
    /* if a method uses DownloadLimit, we switch to SingleInstance mode */
-   if(_config->FindI("Acquire::"+Access+"::DlLimit",0) > 0)
+   if(_config->FindI("Acquire::"+Access+"::Dl-Limit",0) > 0)
       Conf->SingleInstance = true;
     
    return Conf;
@@ -485,7 +485,7 @@ double pkgAcquire::PartialPresent()
 	 Total += (*I)->PartialSize;
    return Total;
 }
-
+									/*}}}*/
 // Acquire::UriBegin - Start iterator for the uri list			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -502,7 +502,6 @@ pkgAcquire::UriIterator pkgAcquire::UriEnd()
    return UriIterator(0);
 }
 									/*}}}*/
-
 // Acquire::MethodConfig::MethodConfig - Constructor			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -516,7 +515,6 @@ pkgAcquire::MethodConfig::MethodConfig()
    Next = 0;
 }
 									/*}}}*/
-
 // Queue::Queue - Constructor						/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -728,7 +726,6 @@ void pkgAcquire::Queue::Bump()
    Cycle();
 }
 									/*}}}*/
-
 // AcquireStatus::pkgAcquireStatus - Constructor			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 1de6f5e44..6c130c1b3 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -30,7 +30,7 @@
    ##################################################################### */
 									/*}}}*/
 
-/** \defgroup acquire Acquire system
+/** \defgroup acquire Acquire system					{{{
  *
  *  \brief The Acquire system is responsible for retrieving files from
  *  local or remote URIs and postprocessing them (for instance,
@@ -54,7 +54,7 @@
  *  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
  *
@@ -78,7 +78,7 @@ using std::string;
 
 class pkgAcquireStatus;
 
-/** \brief The core download scheduler.
+/** \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
@@ -366,8 +366,8 @@ struct pkgAcquire::ItemDesc
    /** brief The underlying item which is to be downloaded. */
    Item *Owner;
 };
-
-/** \brief A single download queue in a pkgAcquire object.
+									/*}}}*/
+/** \brief A single download queue in a pkgAcquire object.		{{{
  *
  *  \todo Why so many protected values?
  */
@@ -528,8 +528,8 @@ class pkgAcquire::Queue
     */
    ~Queue();
 };
-
-/** \brief Iterates over all the URIs being fetched by a pkgAcquire object. */
+									/*}}}*/
+/** \brief Iterates over all the URIs being fetched by a pkgAcquire object.	{{{*/
 class pkgAcquire::UriIterator
 {
    /** The next queue to iterate over. */
@@ -539,7 +539,7 @@ class pkgAcquire::UriIterator
    
    public:
    
-   inline void operator ++() {operator ++();};
+   inline void operator ++() {operator ++(0);};
 
    void operator ++(int)
    {
@@ -568,8 +568,8 @@ class pkgAcquire::UriIterator
       }
    }   
 };
-
-/** \brief Information about the properties of a single acquire method. */
+									/*}}}*/
+/** \brief Information about the properties of a single acquire method.	{{{*/
 struct pkgAcquire::MethodConfig
 {
    /** \brief The next link on the acquire method list.
@@ -621,8 +621,8 @@ struct pkgAcquire::MethodConfig
     */
    MethodConfig();
 };
-
-/** \brief A monitor object for downloads controlled by the pkgAcquire class.
+									/*}}}*/
+/** \brief A monitor object for downloads controlled by the pkgAcquire class.	{{{
  *
  *  \todo Why protected members?
  *
@@ -762,7 +762,7 @@ class pkgAcquireStatus
    pkgAcquireStatus();
    virtual ~pkgAcquireStatus() {};
 };
-
+									/*}}}*/
 /** @} */
 
 #endif
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index b6f4705f3..34da745de 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -442,7 +442,6 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache)
    return true;
 }
 									/*}}}*/
-
 // ProblemResolver::pkgProblemResolver - Constructor			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -489,6 +488,36 @@ void pkgProblemResolver::MakeScores()
    unsigned long Size = Cache.Head().PackageCount;
    memset(Scores,0,sizeof(*Scores)*Size);
 
+   // Important Required Standard Optional Extra
+   signed short PrioMap[] = {
+      0,
+      _config->FindI("pkgProblemResolver::Scores::Important",3),
+      _config->FindI("pkgProblemResolver::Scores::Required",2),
+      _config->FindI("pkgProblemResolver::Scores::Standard",1),
+      _config->FindI("pkgProblemResolver::Scores::Optional",-1),
+      _config->FindI("pkgProblemResolver::Scores::Extra",-2)
+   };
+   signed short PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100);
+   signed short PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1);
+   signed short PrioDepends = _config->FindI("pkgProblemResolver::Scores::Depends",1);
+   signed short PrioRecommends = _config->FindI("pkgProblemResolver::Scores::Recommends",1);
+   signed short AddProtected = _config->FindI("pkgProblemResolver::Scores::AddProtected",10000);
+   signed short AddEssential = _config->FindI("pkgProblemResolver::Scores::AddEssential",5000);
+
+   if (_config->FindB("Debug::pkgProblemResolver::ShowScores",false) == true)
+      clog << "Settings used to calculate pkgProblemResolver::Scores::" << endl
+         << "  Important => " << PrioMap[1] << endl
+         << "  Required => " << PrioMap[2] << endl
+         << "  Standard => " << PrioMap[3] << endl
+         << "  Optional => " << PrioMap[4] << endl
+         << "  Extra => " << PrioMap[5] << endl
+         << "  Essentials => " << PrioEssentials << endl
+         << "  InstalledAndNotObsolete => " << PrioInstalledAndNotObsolete << endl
+         << "  Depends => " << PrioDepends << endl
+         << "  Recommends => " << PrioRecommends << endl
+         << "  AddProtected => " << AddProtected << endl
+         << "  AddEssential => " << AddEssential << endl;
+
    // Generate the base scores for a package based on its properties
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
@@ -502,11 +531,9 @@ void pkgProblemResolver::MakeScores()
 	 to allow an obsolete essential packages to be removed by
 	 a conflicts on a powerfull normal package (ie libc6) */
       if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
-	 Score += 100;
+	 Score += PrioEssentials;
 
       // We transform the priority
-      // Important Required Standard Optional Extra
-      signed short PrioMap[] = {0,3,2,1,-1,-2};
       if (Cache[I].InstVerIter(Cache)->Priority <= 5)
 	 Score += PrioMap[Cache[I].InstVerIter(Cache)->Priority];
       
@@ -515,7 +542,7 @@ void pkgProblemResolver::MakeScores()
 	 if those are not obsolete
       */
       if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable())
-	 Score += 1;
+	 Score += PrioInstalledAndNotObsolete;
    }
 
    // Now that we have the base scores we go and propogate dependencies
@@ -527,9 +554,10 @@ void pkgProblemResolver::MakeScores()
       for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false; D++)
       {
 	 if (D->Type == pkgCache::Dep::Depends || 
-	     D->Type == pkgCache::Dep::PreDepends || 
-	     D->Type == pkgCache::Dep::Recommends) 
-	    Scores[D.TargetPkg()->ID]++;
+	     D->Type == pkgCache::Dep::PreDepends)
+	    Scores[D.TargetPkg()->ID] += PrioDepends;
+	 else if (D->Type == pkgCache::Dep::Recommends)
+	    Scores[D.TargetPkg()->ID] += PrioRecommends;
       }
    }   
    
@@ -576,10 +604,10 @@ void pkgProblemResolver::MakeScores()
    for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
       if ((Flags[I->ID] & Protected) != 0)
-	 Scores[I->ID] += 10000;
+	 Scores[I->ID] += AddProtected;
       if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
-	 Scores[I->ID] += 5000;
-   }   
+	 Scores[I->ID] += AddEssential;
+   }
 }
 									/*}}}*/
 // ProblemResolver::DoUpgrade - Attempt to upgrade this package		/*{{{*/
@@ -755,19 +783,21 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
       *PEnd++ = I;
    This = this;
    qsort(PList,PEnd - PList,sizeof(*PList),&ScoreSort);
-   
-/* for (pkgCache::Package **K = PList; K != PEnd; K++)
-      if (Scores[(*K)->ID] != 0)
-      {
-	 pkgCache::PkgIterator Pkg(Cache,*K);
-	 clog << Scores[(*K)->ID] << ' ' << Pkg.Name() <<
-	    ' ' << (pkgCache::Version *)Pkg.CurrentVer() << ' ' << 
-	    Cache[Pkg].InstallVer << ' ' << Cache[Pkg].CandidateVer << endl;
-      } */
+
+   if (_config->FindB("Debug::pkgProblemResolver::ShowScores",false) == true)
+   {
+      clog << "Show Scores" << endl;
+      for (pkgCache::Package **K = PList; K != PEnd; K++)
+         if (Scores[(*K)->ID] != 0)
+         {
+           pkgCache::PkgIterator Pkg(Cache,*K);
+           clog << Scores[(*K)->ID] << ' ' << Pkg << std::endl;
+         }
+   }
 
    if (Debug == true)
       clog << "Starting 2" << endl;
-   
+
    /* Now consider all broken packages. For each broken package we either
       remove the package or fix it's problem. We do this once, it should
       not be possible for a loop to form (that is a < b < c and fixing b by
@@ -882,7 +912,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 	    }
 	    
 	    if (Debug == true)
-	       clog << "Package " << I.Name() << " has broken dep on " << Start.TargetPkg().Name() << endl;
+	       clog << "Package " << I.Name() << " has broken " << Start.DepType() << " on " << Start.TargetPkg().Name() << endl;
 
 	    /* Look across the version list. If there are no possible
 	       targets then we keep the package and bail. This is necessary
@@ -964,12 +994,9 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 			   if (Debug == true)
 			      clog << "  Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl;
 			   Cache.MarkDelete(I);
-			   if (Counter > 1)
-			   {
-			      if (Scores[Pkg->ID] > Scores[I->ID])
-				 Scores[I->ID] = Scores[Pkg->ID];
-			   }			   
-			}			
+			   if (Counter > 1 && Scores[Pkg->ID] > Scores[I->ID])
+			      Scores[I->ID] = Scores[Pkg->ID];
+			}
 		     }
 		  }
 		  		  
@@ -1141,9 +1168,6 @@ bool pkgProblemResolver::ResolveByKeep()
 
    unsigned long Size = Cache.Head().PackageCount;
 
-   if (Debug == true)      
-      clog << "Entering ResolveByKeep" << endl;
-   
    MakeScores();
    
    /* We have to order the packages so that the broken fixing pass 
@@ -1156,7 +1180,21 @@ bool pkgProblemResolver::ResolveByKeep()
       *PEnd++ = I;
    This = this;
    qsort(PList,PEnd - PList,sizeof(*PList),&ScoreSort);
-   
+
+   if (_config->FindB("Debug::pkgProblemResolver::ShowScores",false) == true)
+   {
+      clog << "Show Scores" << endl;
+      for (pkgCache::Package **K = PList; K != PEnd; K++)
+         if (Scores[(*K)->ID] != 0)
+         {
+           pkgCache::PkgIterator Pkg(Cache,*K);
+           clog << Scores[(*K)->ID] << ' ' << Pkg << std::endl;
+         }
+   }
+
+   if (Debug == true)
+      clog << "Entering ResolveByKeep" << endl;
+
    // Consider each broken package 
    pkgCache::Package **LastStop = 0;
    for (pkgCache::Package **K = PList; K != PEnd; K++)
@@ -1202,8 +1240,8 @@ bool pkgProblemResolver::ResolveByKeep()
 	 while (true)
 	 {
 	    if (Debug == true)
-	       clog << "Package " << I.Name() << " has broken dep on " << Start.TargetPkg().Name() << endl;
-	    
+	       clog << "Package " << I.Name() << " has broken " << Start.DepType() << " on " << Start.TargetPkg().Name() << endl;
+
 	    // Look at all the possible provides on this package
 	    SPtrArray<pkgCache::Version *> VList = Start.AllTargets();
 	    for (pkgCache::Version **V = VList; *V != 0; V++)
@@ -1219,7 +1257,7 @@ bool pkgProblemResolver::ResolveByKeep()
 	       if ((Flags[I->ID] & Protected) == 0)
 	       {
 		  if (Debug == true)
-		     clog << "  Keeping Package " << Pkg.Name() << " due to dep" << endl;
+		     clog << "  Keeping Package " << Pkg.Name() << " due to " << Start.DepType() << endl;
 		  Cache.MarkKeep(Pkg, false, false);
 	       }
 	       
@@ -1276,7 +1314,6 @@ void pkgProblemResolver::InstallProtect()
    }   
 }
 									/*}}}*/
-
 // PrioSortList - Sort a list of versions by priority			/*{{{*/
 // ---------------------------------------------------------------------
 /* This is ment to be used in conjunction with AllTargets to get a list 
@@ -1307,7 +1344,6 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List)
    qsort(List,Count,sizeof(*List),PrioComp);
 }
 									/*}}}*/
-
 // CacheFile::ListUpdate - update the cache files                    	/*{{{*/
 // ---------------------------------------------------------------------
 /* This is a simple wrapper to update the cache. it will fetch stuff
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index d183cd213..cee30b679 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -39,7 +39,7 @@
 
 using std::ostream;
 
-class pkgSimulate : public pkgPackageManager
+class pkgSimulate : public pkgPackageManager				/*{{{*/
 {
    protected:
 
@@ -75,8 +75,8 @@ private:
 
    pkgSimulate(pkgDepCache *Cache);
 };
-
-class pkgProblemResolver
+									/*}}}*/
+class pkgProblemResolver						/*{{{*/
 {
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
@@ -124,7 +124,7 @@ class pkgProblemResolver
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 };
-
+									/*}}}*/
 bool pkgDistUpgrade(pkgDepCache &Cache);
 bool pkgApplyStatus(pkgDepCache &Cache);
 bool pkgFixBroken(pkgDepCache &Cache);
diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 1a84aea54..790312dc8 100644
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -24,7 +24,6 @@
     
 #include <apti18n.h>
 									/*}}}*/
-
 // CacheFile::CacheFile - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -49,6 +48,7 @@ pkgCacheFile::~pkgCacheFile()
 /* */
 bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock)
 {
+   const bool ErrorWasEmpty = _error->empty();
    if (WithLock == true)
       if (_system->Lock() == false)
 	 return false;
@@ -71,7 +71,7 @@ bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock)
       return _error->Error(_("The package lists or status file could not be parsed or opened."));
 
    /* This sux, remove it someday */
-   if (_error->empty() == false)
+   if (ErrorWasEmpty == true && _error->empty() == false)
       _error->Warning(_("You may want to run apt-get update to correct these problems"));
 
    Cache = new pkgCache(Map);
@@ -92,7 +92,8 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
    Policy = new pkgPolicy(Cache);
    if (_error->PendingError() == true)
       return false;
-   if (ReadPinFile(*Policy) == false)
+
+   if (ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false)
       return false;
    
    // Create the dependency cache
@@ -108,8 +109,6 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
    return true;
 }
 									/*}}}*/
-
-
 // CacheFile::Close - close the cache files				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index bbbcb7753..28466cd40 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -32,7 +32,7 @@
 #define PKGLIB_CACHEITERATORS_H
 
 
-// Package Iterator
+// Package Iterator							/*{{{*/
 class pkgCache::PkgIterator
 {
    friend class pkgCache;
@@ -80,7 +80,13 @@ class pkgCache::PkgIterator
    inline PrvIterator ProvidesList() const;
    inline unsigned long Index() const {return Pkg - Owner->PkgP;};
    OkState State() const;
-   
+
+   //Nice printable representation
+   friend std::ostream& operator<<(std::ostream& out, pkgCache::PkgIterator Pkg);
+
+   const char *CandVersion() const;
+   const char *CurVersion() const;
+
    // Constructors
    inline PkgIterator(pkgCache &Owner,Package *Trg) : Pkg(Trg), Owner(&Owner),
           HashIndex(0) 
@@ -90,8 +96,8 @@ class pkgCache::PkgIterator
    };
    inline PkgIterator() : Pkg(0), Owner(0), HashIndex(0) {};
 };
-
-// Version Iterator
+									/*}}}*/
+// Version Iterator							/*{{{*/
 class pkgCache::VerIterator
 {
    Version *Ver;
@@ -111,7 +117,10 @@ class pkgCache::VerIterator
    inline bool operator ==(const VerIterator &B) const {return Ver == B.Ver;};
    inline bool operator !=(const VerIterator &B) const {return Ver != B.Ver;};
    int CompareVer(const VerIterator &B) const;
-   
+
+   // Testing
+   inline bool IsGood() const { return Ver && Owner && ! end();};
+
    // Accessors
    inline Version *operator ->() {return Ver;};
    inline Version const *operator ->() const {return Ver;};
@@ -146,8 +155,8 @@ class pkgCache::VerIterator
 	 Ver = Owner.VerP;
    };
 };
-
-// Description Iterator
+									/*}}}*/
+// Description Iterator							/*{{{*/
 class pkgCache::DescIterator
 {
    Description *Desc;
@@ -190,8 +199,8 @@ class pkgCache::DescIterator
 	 Desc = Owner.DescP;
    };
 };
-
-// Dependency iterator
+									/*}}}*/
+// Dependency iterator							/*{{{*/
 class pkgCache::DepIterator
 {
    Dependency *Dep;
@@ -249,8 +258,8 @@ class pkgCache::DepIterator
    };
    inline DepIterator() : Dep(0), Type(DepVer), Owner(0) {};
 };
-
-// Provides iterator
+									/*}}}*/
+// Provides iterator							/*{{{*/
 class pkgCache::PrvIterator
 {
    Provides *Prv;
@@ -302,8 +311,8 @@ class pkgCache::PrvIterator
 	 Prv = Owner.ProvideP;
    };
 };
-
-// Package file 
+									/*}}}*/
+// Package file								/*{{{*/
 class pkgCache::PkgFileIterator
 {
    pkgCache *Owner;
@@ -333,6 +342,7 @@ class pkgCache::PkgFileIterator
    inline const char *Component() const {return File->Component == 0?0:Owner->StrP + File->Component;};
    inline const char *Version() const {return File->Version == 0?0:Owner->StrP + File->Version;};
    inline const char *Origin() const {return File->Origin == 0?0:Owner->StrP + File->Origin;};
+   inline const char *Codename() const {return File->Codename ==0?0:Owner->StrP + File->Codename;};
    inline const char *Label() const {return File->Label == 0?0:Owner->StrP + File->Label;};
    inline const char *Site() const {return File->Site == 0?0:Owner->StrP + File->Site;};
    inline const char *Architecture() const {return File->Architecture == 0?0:Owner->StrP + File->Architecture;};
@@ -348,8 +358,8 @@ class pkgCache::PkgFileIterator
    inline PkgFileIterator(pkgCache &Owner) : Owner(&Owner), File(Owner.PkgFileP) {};
    inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Owner(&Owner), File(Trg) {};
 };
-
-// Version File 
+									/*}}}*/
+// Version File								/*{{{*/
 class pkgCache::VerFileIterator
 {
    pkgCache *Owner;
@@ -380,8 +390,8 @@ class pkgCache::VerFileIterator
    inline VerFileIterator() : Owner(0), FileP(0) {};
    inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Owner(&Owner), FileP(Trg) {};
 };
-
-// Description File 
+									/*}}}*/
+// Description File							/*{{{*/
 class pkgCache::DescFileIterator
 {
    pkgCache *Owner;
@@ -412,8 +422,8 @@ class pkgCache::DescFileIterator
    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
+									/*}}}*/
+// 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);};
 inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const
@@ -432,5 +442,5 @@ inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const
        {return VerFileIterator(*Owner,Owner->VerFileP + Ver->FileList);};
 inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const
        {return DescFileIterator(*Owner,Owner->DescFileP + Desc->FileList);};
-
+									/*}}}*/
 #endif
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index a31602dfa..72d8e4d41 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <algorithm>
-
+#include <dlfcn.h>
 
 #include "indexcopy.h"
 
@@ -160,7 +160,7 @@ bool pkgCdrom::FindPackages(string CD,
    
    return !_error->PendingError();
 }
-
+									/*}}}*/
 // Score - We compute a 'score' for a path				/*{{{*/
 // ---------------------------------------------------------------------
 /* Paths are scored based on how close they come to what I consider
@@ -210,7 +210,6 @@ int pkgCdrom::Score(string Path)
 
    return Res;
 }
-
 									/*}}}*/
 // DropBinaryArch - Dump dirs with a string like /binary-<foo>/		/*{{{*/
 // ---------------------------------------------------------------------
@@ -248,8 +247,7 @@ bool pkgCdrom::DropBinaryArch(vector<string> &List)
    
    return true;
 }
-
-
+									/*}}}*/
 // DropRepeats - Drop repeated files resulting from symlinks		/*{{{*/
 // ---------------------------------------------------------------------
 /* Here we go and stat every file that we found and strip dup inodes. */
@@ -304,7 +302,6 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
    return true;
 }
 									/*}}}*/
-
 // ReduceSourceList - Takes the path list and reduces it		/*{{{*/
 // ---------------------------------------------------------------------
 /* This takes the list of source list expressed entires and collects
@@ -513,9 +510,8 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    
    return true;
 }
-
-
-bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)
+									/*}}}*/
+bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)		/*{{{*/
 {
    stringstream msg;
 
@@ -573,9 +569,8 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)
 
    return true;
 }
-
-
-bool pkgCdrom::Add(pkgCdromStatus *log)
+									/*}}}*/
+bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
 {
    stringstream msg;
 
@@ -844,3 +839,88 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
 
    return true;
 }
+									/*}}}*/
+pkgUdevCdromDevices::pkgUdevCdromDevices()                     		/*{{{*/
+   : libudev_handle(NULL)
+{
+
+}
+									/*}}}*/
+
+bool
+pkgUdevCdromDevices::Dlopen()                     		        /*{{{*/
+{
+   // alread open
+   if(libudev_handle != NULL)
+      return true;
+
+   // see if we can get libudev
+   void *h = ::dlopen("libudev.so.0", RTLD_LAZY);
+   if(h == NULL)
+      return false;
+
+   // get the pointers to the udev structs
+   libudev_handle = h;
+   udev_new = (udev* (*)(void)) dlsym(h, "udev_new");
+   udev_enumerate_add_match_property = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_property");
+   udev_enumerate_scan_devices = (int (*)(udev_enumerate*))dlsym(h, "udev_enumerate_scan_devices");
+   udev_enumerate_get_list_entry = (udev_list_entry* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_list_entry");
+   udev_device_new_from_syspath = (udev_device* (*)(udev*, const char*))dlsym(h, "udev_device_new_from_syspath");
+   udev_enumerate_get_udev = (udev* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_udev");
+   udev_list_entry_get_name = (const char* (*)(udev_list_entry*))dlsym(h, "udev_list_entry_get_name");
+   udev_device_get_devnode = (const char* (*)(udev_device*))dlsym(h, "udev_device_get_devnode");
+   udev_enumerate_new = (udev_enumerate* (*)(udev*))dlsym(h, "udev_enumerate_new");
+   udev_list_entry_get_next = (udev_list_entry* (*)(udev_list_entry*))dlsym(h, "udev_list_entry_get_next");
+   udev_device_get_property_value = (const char* (*)(udev_device *, const char *))dlsym(h, "udev_device_get_property_value");
+
+   return true;
+}
+									/*}}}*/
+vector<CdromDevice>
+pkgUdevCdromDevices::Scan()                                             /*{{{*/
+{
+   vector<CdromDevice> cdrom_devices;
+   struct udev_enumerate *enumerate;
+   struct udev_list_entry *l, *devices;
+   struct udev *udev_ctx;
+
+   if(libudev_handle == NULL)
+      return cdrom_devices;
+
+   udev_ctx = udev_new();
+   enumerate = udev_enumerate_new (udev_ctx);
+   udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
+
+   udev_enumerate_scan_devices (enumerate);
+   devices = udev_enumerate_get_list_entry (enumerate);
+   for (l = devices; l != NULL; l = udev_list_entry_get_next (l))
+   {
+      CdromDevice cdrom;
+      struct udev_device *udevice;
+      udevice = udev_device_new_from_syspath (udev_enumerate_get_udev (enumerate), udev_list_entry_get_name (l));
+      if (udevice == NULL)
+	 continue;
+      const char* devnode = udev_device_get_devnode(udevice);
+      const char* mountpath = udev_device_get_property_value(udevice, "FSTAB_DIR");
+
+      // fill in the struct
+      cdrom.DeviceName = string(devnode);
+      if (mountpath) {
+	 cdrom.MountPath = mountpath;
+	 string s = string(mountpath);
+	 cdrom.Mounted = IsMounted(s);
+      } else {
+	 cdrom.Mounted = false;
+	 cdrom.MountPath = "";
+      }
+      cdrom_devices.push_back(cdrom);
+   } 
+   return cdrom_devices;
+}
+									/*}}}*/
+
+pkgUdevCdromDevices::~pkgUdevCdromDevices()                             /*{{{*/
+{ 
+   dlclose(libudev_handle);
+}
+									/*}}}*/
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 68d61c098..14ca1d810 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -8,7 +8,7 @@
 
 using namespace std;
 
-class pkgCdromStatus
+class pkgCdromStatus							/*{{{*/
 {
  protected:
    int totalSteps;
@@ -29,8 +29,8 @@ class pkgCdromStatus
    // Progress indicator for the Index rewriter
    virtual OpProgress* GetOpProgress() {return NULL; };
 };
-
-class pkgCdrom 
+									/*}}}*/
+class pkgCdrom								/*{{{*/
 {
  protected:
    enum {
@@ -65,7 +65,43 @@ class pkgCdrom
    bool Ident(string &ident, pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 };
+									/*}}}*/
 
 
+// class that uses libudev to find cdrom devices dynamically
+struct CdromDevice							/*{{{*/
+{
+   string DeviceName;
+   bool Mounted;
+   string MountPath;
+};
+									/*}}}*/
+class pkgUdevCdromDevices						/*{{{*/
+{
+ protected:
+   // libudev dlopen stucture
+   void *libudev_handle;
+   struct udev* (*udev_new)(void);
+   int (*udev_enumerate_add_match_property)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
+   int (*udev_enumerate_scan_devices)(struct udev_enumerate *udev_enumerate);
+   struct udev_list_entry* (*udev_enumerate_get_list_entry)(struct udev_enumerate *udev_enumerate);
+   struct udev_device* (*udev_device_new_from_syspath)(struct udev *udev, const char *syspath);
+   struct udev* (*udev_enumerate_get_udev)(struct udev_enumerate *udev_enumerate);
+   const char* (*udev_list_entry_get_name)(struct udev_list_entry *list_entry);
+   const char* (*udev_device_get_devnode)(struct udev_device *udev_device);
+   struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
+   struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
+   const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);
+   // end libudev dlopen
+   
+ public:
+   pkgUdevCdromDevices();
+   virtual ~pkgUdevCdromDevices();
+
+   // try to open 
+   bool Dlopen();
+   vector<CdromDevice> Scan();
+};
+									/*}}}*/
 
 #endif
diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 3fa67e8e6..0d1dfbf74 100644
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -19,7 +19,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 									/*}}}*/
-
 // ArchiveCleaner::Go - Perform smart cleanup of the archive		/*{{{*/
 // ---------------------------------------------------------------------
 /* Scan the directory for files to erase, we check the version information
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index b6524a178..0cf9697ac 100644
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -98,7 +98,7 @@ bool UnmountCdrom(string Path)
 // MountCdrom - Mount a cdrom						/*{{{*/
 // ---------------------------------------------------------------------
 /* We fork mount and drop all messages */
-bool MountCdrom(string Path)
+bool MountCdrom(string Path, string DeviceName)
 {
    if (IsMounted(Path) == true)
       return true;
@@ -122,8 +122,15 @@ bool MountCdrom(string Path)
       {
 	 const char *Args[10];
 	 Args[0] = "mount";
-	 Args[1] = Path.c_str();
-	 Args[2] = 0;
+	 if (DeviceName == "") 
+	 {
+	    Args[1] = Path.c_str();
+	    Args[2] = 0;
+	 } else {
+	    Args[1] = DeviceName.c_str();
+	    Args[2] = Path.c_str();
+	    Args[3] = 0;
+	 }
 	 execvp(Args[0],(char **)Args);      
 	 _exit(100);
       }      
diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index f24bb8c70..9d14249c5 100644
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -14,7 +14,8 @@
 
 using std::string;
 
-bool MountCdrom(string Path);
+// mount cdrom, DeviceName (e.g. /dev/sr0) is optional
+bool MountCdrom(string Path, string DeviceName="");
 bool UnmountCdrom(string Path);
 bool IdentCdrom(string CD,string &Res,unsigned int Version = 2);
 bool IsMounted(string &Path);
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 7326b84ea..48a5f0bff 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -182,9 +182,9 @@ string Configuration::FindFile(const char *Name,const char *Default) const
    if (Itm == 0 || Itm->Value.empty() == true)
    {
       if (Default == 0)
-	 return "";
+	 return rootDir;
       else
-	 return Default;
+	 return rootDir + Default;
    }
    
    string val = Itm->Value;
@@ -521,6 +521,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
 	  F.getline(Buffer,sizeof(Buffer) / 2);
 
 	  Input += Buffer;
+	  delete[] Buffer;
 	}
       while (F.fail() && !F.eof());
 
@@ -582,7 +583,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
 	 if (InQuote == true)
 	    continue;
 	 
-	 if (*I == '/' && I + 1 != End && I[1] == '/')
+	 if ((*I == '/' && I + 1 != End && I[1] == '/') || *I == '#')
          {
 	    End = I;
 	    break;
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index db8c53c36..927b7e05c 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -84,17 +84,17 @@ bool GlobalError::Errno(const char *Function,const char *Description,...)
    char S[400];
    vsnprintf(S,sizeof(S),Description,args);
    snprintf(S + strlen(S),sizeof(S) - strlen(S),
-	    " - %s (%i %s)",Function,errno,strerror(errno));
+	    " - %s (%i: %s)",Function,errno,strerror(errno));
 
    // Put it on the list
    Item *Itm = new Item;
    Itm->Text = S;
    Itm->Error = true;
    Insert(Itm);
-   
+
    PendingFlag = true;
 
-   return false;   
+   return false;
 }
 									/*}}}*/
 // GlobalError::WarningE - Get part of the warn string from errno	/*{{{*/
@@ -112,15 +112,16 @@ bool GlobalError::WarningE(const char *Function,const char *Description,...)
    // sprintf the description
    char S[400];
    vsnprintf(S,sizeof(S),Description,args);
-   snprintf(S + strlen(S),sizeof(S) - strlen(S)," - %s (%i %s)",Function,errno,strerror(errno));
+   snprintf(S + strlen(S),sizeof(S) - strlen(S),
+	    " - %s (%i: %s)",Function,errno,strerror(errno));
 
    // Put it on the list
    Item *Itm = new Item;
    Itm->Text = S;
    Itm->Error = false;
    Insert(Itm);
-   
-   return false;   
+
+   return false;
 }
 									/*}}}*/
 // GlobalError::Error - Add an error to the list			/*{{{*/
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index fcc2f887c..b43771ea7 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -34,7 +34,7 @@ HashString::HashString(string Type, string Hash) : Type(Type), Hash(Hash)
 {
 }
 
-HashString::HashString(string StringedHash)
+HashString::HashString(string StringedHash)				/*{{{*/
 {
    // legacy: md5sum without "MD5Sum:" prefix
    if (StringedHash.find(":") == string::npos && StringedHash.size() == 32)
@@ -50,9 +50,8 @@ HashString::HashString(string StringedHash)
    if(_config->FindB("Debug::Hashes",false) == true)
       std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
 }
-
-
-bool HashString::VerifyFile(string filename) const
+									/*}}}*/
+bool HashString::VerifyFile(string filename) const			/*{{{*/
 {
    FileFd fd;
    MD5Summation MD5;
@@ -83,7 +82,7 @@ bool HashString::VerifyFile(string filename) const
 
    return (fileHash == Hash);
 }
-
+									/*}}}*/
 const char** HashString::SupportedHashes()
 {
    return _SupportedHashes;
@@ -94,13 +93,11 @@ bool HashString::empty() const
    return (Type.empty() || Hash.empty());
 }
 
-
 string HashString::toStr() const
 {
    return Type+string(":")+Hash;
 }
 
-
 // Hashes::AddFD - Add the contents of the FD				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -108,11 +105,16 @@ bool Hashes::AddFD(int Fd,unsigned long Size)
 {
    unsigned char Buf[64*64];
    int Res = 0;
-   while (Size != 0)
+   int ToEOF = (Size == 0);
+   while (Size != 0 || ToEOF)
    {
-      Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf)));
-      if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf)))
-	 return false;
+      unsigned n = sizeof(Buf);
+      if (!ToEOF) n = min(Size,(unsigned long)n);
+      Res = read(Fd,Buf,n);
+      if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
+         return false;
+      if (ToEOF && Res == 0) // EOF
+         break;
       Size -= Res;
       MD5.Add(Buf,Res);
       SHA1.Add(Buf,Res);
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index a095f8f0f..2bfd70f1b 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -294,11 +294,16 @@ bool MD5Summation::AddFD(int Fd,unsigned long Size)
 {
    unsigned char Buf[64*64];
    int Res = 0;
-   while (Size != 0)
+   int ToEOF = (Size == 0);
+   while (Size != 0 || ToEOF)
    {
-      Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf)));
-      if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf)))
-	 return false;
+      unsigned n = sizeof(Buf);
+      if (!ToEOF) n = min(Size,(unsigned long)n);
+      Res = read(Fd,Buf,n);
+      if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
+         return false;
+      if (ToEOF && Res == 0) // EOF
+         break;
       Size -= Res;
       Add(Buf,Res);
    }
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 04a45811b..aa52b4c30 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -13,11 +13,6 @@
    libc6 generates warnings -- which should be errors, g++ isn't properly
    strict.
    
-   The configure test notes that some OS's have broken private mmap's
-   so on those OS's we can't use mmap. This means we have to use
-   configure to test mmap and can't rely on the POSIX
-   _POSIX_MAPPED_FILES test.
-   
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
@@ -31,6 +26,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <stdlib.h>
 
 #include <cstring>
    									/*}}}*/
@@ -144,7 +140,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
 // DynamicMMap::DynamicMMap - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) : 
+DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) :
              MMap(F,Flags | NoImmMap), Fd(&F), WorkSpace(WorkSpace)
 {
    if (_error->PendingError() == true)
@@ -166,15 +162,34 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace)
 									/*}}}*/
 // DynamicMMap::DynamicMMap - Constructor for a non-file backed map	/*{{{*/
 // ---------------------------------------------------------------------
-/* This is just a fancy malloc really.. */
+/* We try here to use mmap to reserve some space - this is much more
+   cooler than the fallback solution to simply allocate a char array
+   and could come in handy later than we are able to grow such an mmap */
 DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long WorkSpace) :
              MMap(Flags | NoImmMap | UnMapped), Fd(0), WorkSpace(WorkSpace)
 {
    if (_error->PendingError() == true)
       return;
-   
+
+#ifdef _POSIX_MAPPED_FILES
+   // Set the permissions.
+   int Prot = PROT_READ;
+   int Map = MAP_PRIVATE | MAP_ANONYMOUS;
+   if ((Flags & ReadOnly) != ReadOnly)
+      Prot |= PROT_WRITE;
+   if ((Flags & Public) == Public)
+      Map = MAP_SHARED | MAP_ANONYMOUS;
+
+   // use anonymous mmap() to get the memory
+   Base = (unsigned char*) mmap(0, WorkSpace, Prot, Map, -1, 0);
+
+   if(Base == MAP_FAILED)
+      _error->Errno("DynamicMMap",_("Couldn't make mmap of %lu bytes"),WorkSpace);
+#else
+   // fallback to a static allocated space
    Base = new unsigned char[WorkSpace];
    memset(Base,0,WorkSpace);
+#endif
    iSize = 0;
 }
 									/*}}}*/
@@ -185,7 +200,11 @@ DynamicMMap::~DynamicMMap()
 {
    if (Fd == 0)
    {
+#ifdef _POSIX_MAPPED_FILES
+      munmap(Base, WorkSpace);
+#else
       delete [] (unsigned char *)Base;
+#endif
       return;
    }
    
@@ -204,17 +223,19 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
    unsigned long Result = iSize;
    if (Aln != 0)
       Result += Aln - (iSize%Aln);
-   
+
    iSize = Result + Size;
-   
-   // Just in case error check
-   if (Result + Size > WorkSpace)
+
+   // try to grow the buffer
+   while(Result + Size > WorkSpace)
    {
-	  _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
-				  "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
-      return 0;
+      if(!Grow())
+      {
+	 _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
+			 "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
+	 return 0;
+      }
    }
-
    return Result;
 }
 									/*}}}*/
@@ -223,7 +244,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
 /* This allocates an Item of size ItemSize so that it is aligned to its
    size in the file. */
 unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
-{   
+{
    // Look for a matching pool entry
    Pool *I;
    Pool *Empty = 0;
@@ -234,7 +255,6 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
       if (I->ItemSize == ItemSize)
 	 break;
    }
-
    // No pool is allocated, use an unallocated one
    if (I == Pools + PoolCount)
    {
@@ -249,17 +269,24 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
       I->ItemSize = ItemSize;
       I->Count = 0;
    }
-   
+
+   unsigned long Result = 0;
    // Out of space, allocate some more
    if (I->Count == 0)
    {
-      I->Count = 20*1024/ItemSize;
-      I->Start = RawAllocate(I->Count*ItemSize,ItemSize);
-   }   
+      const unsigned long size = 20*1024;
+      I->Count = size/ItemSize;
+      Result = RawAllocate(size,ItemSize);
+      // Does the allocation failed ?
+      if (Result == 0 && _error->PendingError())
+	 return 0;
+      I->Start = Result;
+   }
+   else
+      Result = I->Start;
 
    I->Count--;
-   unsigned long Result = I->Start;
-   I->Start += ItemSize;  
+   I->Start += ItemSize;
    return Result/ItemSize;
 }
 									/*}}}*/
@@ -269,20 +296,45 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
 unsigned long DynamicMMap::WriteString(const char *String,
 				       unsigned long Len)
 {
-   unsigned long Result = iSize;
-   // Just in case error check
-   if (Result + Len > WorkSpace)
-   {
-	  _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
-				  "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
-      return 0;
-   }   
-   
    if (Len == (unsigned long)-1)
       Len = strlen(String);
-   iSize += Len + 1;
+
+   unsigned long Result = RawAllocate(Len+1,0);
+
+   if (Result == 0 && _error->PendingError())
+      return 0;
+
    memcpy((char *)Base + Result,String,Len);
    ((char *)Base)[Result + Len] = 0;
    return Result;
 }
 									/*}}}*/
+// DynamicMMap::Grow - Grow the mmap					/*{{{*/
+// ---------------------------------------------------------------------
+/* This method will try to grow the mmap we currently use. This doesn't
+   work most of the time because we can't move the mmap around in the
+   memory for now as this would require to adjust quite a lot of pointers
+   but why we should not at least try to grow it before we give up? */
+bool DynamicMMap::Grow()
+{
+#ifdef _POSIX_MAPPED_FILES
+   unsigned long newSize = WorkSpace + 1024*1024;
+
+   if(Fd != 0)
+   {
+      Fd->Seek(newSize - 1);
+      char C = 0;
+      Fd->Write(&C,sizeof(C));
+   }
+
+   Base = mremap(Base, WorkSpace, newSize, 0);
+   if(Base == MAP_FAILED)
+      return false;
+
+   WorkSpace = newSize;
+   return true;
+#else
+   return false;
+#endif
+}
+									/*}}}*/
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index 19cf7582d..bde62217d 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -84,6 +84,8 @@ class DynamicMMap : public MMap
    unsigned long WorkSpace;
    Pool *Pools;
    unsigned int PoolCount;
+
+   bool Grow();
    
    public:
 
diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc
index ecda3d8e8..e380c13ae 100644
--- a/apt-pkg/contrib/sha256.cc
+++ b/apt-pkg/contrib/sha256.cc
@@ -1,5 +1,5 @@
 /*
- * Cryptographic API.
+ * Cryptographic API.							{{{
  *
  * SHA-256, as specified in
  * http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf
@@ -17,7 +17,7 @@
  * Software Foundation; either version 2 of the License, or (at your option) 
  * any later version.
  *
- */
+ */									/*}}}*/
 
 #ifdef __GNUG__
 #pragma implementation "apt-pkg/sha256.h"
@@ -65,20 +65,20 @@ static inline u32 Maj(u32 x, u32 y, u32 z)
 #define H6         0x1f83d9ab
 #define H7         0x5be0cd19
 
-static inline void LOAD_OP(int I, u32 *W, const u8 *input)
+static inline void LOAD_OP(int I, u32 *W, const u8 *input)		/*{{{*/
 {
 	W[I] = (  ((u32) input[I * 4 + 0] << 24)
 		| ((u32) input[I * 4 + 1] << 16)
 		| ((u32) input[I * 4 + 2] << 8)
 		| ((u32) input[I * 4 + 3]));
 }
-
+									/*}}}*/
 static inline void BLEND_OP(int I, u32 *W)
 {
         W[I] = s1(W[I-2]) + W[I-7] + s0(W[I-15]) + W[I-16];
 }
 
-static void sha256_transform(u32 *state, const u8 *input)
+static void sha256_transform(u32 *state, const u8 *input)		/*{{{*/
 {
         u32 a, b, c, d, e, f, g, h, t1, t2;
         u32 W[64];
@@ -240,8 +240,8 @@ static void sha256_transform(u32 *state, const u8 *input)
         a = b = c = d = e = f = g = h = t1 = t2 = 0;
         memset(W, 0, 64 * sizeof(u32));
 }
-
-SHA256Summation::SHA256Summation()
+									/*}}}*/
+SHA256Summation::SHA256Summation()					/*{{{*/
 {
         Sum.state[0] = H0;
         Sum.state[1] = H1;
@@ -255,8 +255,8 @@ SHA256Summation::SHA256Summation()
         memset(Sum.buf, 0, sizeof(Sum.buf));
         Done = false;
 }
-
-bool SHA256Summation::Add(const u8 *data, unsigned long len)
+									/*}}}*/
+bool SHA256Summation::Add(const u8 *data, unsigned long len)		/*{{{*/
 {
         struct sha256_ctx *sctx = &Sum;
         unsigned int i, index, part_len;
@@ -291,8 +291,8 @@ bool SHA256Summation::Add(const u8 *data, unsigned long len)
 
         return true;
 }
-
-SHA256SumValue SHA256Summation::Result()
+									/*}}}*/
+SHA256SumValue SHA256Summation::Result()				/*{{{*/
 {
    struct sha256_ctx *sctx = &Sum;
    if (!Done) {
@@ -340,7 +340,7 @@ SHA256SumValue SHA256Summation::Result()
 
    return res;
 }
-
+									/*}}}*/
 // SHA256SumValue::SHA256SumValue - Constructs the sum from a string   /*{{{*/
 // ---------------------------------------------------------------------
 /* The string form of a SHA256 is a 64 character hex number */
@@ -349,7 +349,6 @@ SHA256SumValue::SHA256SumValue(string Str)
    memset(Sum,0,sizeof(Sum));
    Set(Str);
 }
-
                                                                        /*}}}*/
 // SHA256SumValue::SHA256SumValue - Default constructor                /*{{{*/
 // ---------------------------------------------------------------------
@@ -358,7 +357,6 @@ SHA256SumValue::SHA256SumValue()
 {
    memset(Sum,0,sizeof(Sum));
 }
-
                                                                        /*}}}*/
 // SHA256SumValue::Set - Set the sum from a string                     /*{{{*/
 // ---------------------------------------------------------------------
@@ -391,9 +389,7 @@ string SHA256SumValue::Value() const
 
    return string(Result);
 }
-
-
-
+									/*}}}*/
 // SHA256SumValue::operator == - Comparator                            /*{{{*/
 // ---------------------------------------------------------------------
 /* Call memcmp on the buffer */
@@ -402,8 +398,6 @@ bool SHA256SumValue::operator == (const SHA256SumValue & rhs) const
    return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
 }
                                                                        /*}}}*/
-
-
 // SHA256Summation::AddFD - Add content of file into the checksum      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 0b1bc3c98..a991b8988 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -387,6 +387,17 @@ string SubstVar(string Str,const struct SubstVar *Vars)
    return Str;
 }
 									/*}}}*/
+// OutputInDepth - return a string with separator multiplied with depth /*{{{*/
+// ---------------------------------------------------------------------
+/* Returns a string with the supplied separator depth + 1 times in it */
+std::string OutputInDepth(const unsigned long Depth, const char* Separator)
+{
+   std::string output = "";
+   for(unsigned long d=Depth+1; d > 0; d--)
+      output.append(Separator);
+   return output;
+}
+									/*}}}*/
 // URItoFileName - Convert the uri into a unique file name		/*{{{*/
 // ---------------------------------------------------------------------
 /* This converts a URI into a safe filename. It quotes all unsafe characters
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 51416a24a..0cbf14a7a 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -48,6 +48,7 @@ string DeQuoteString(const string &Str);
 string SizeToStr(double Bytes);
 string TimeToStr(unsigned long Sec);
 string Base64Encode(const string &Str);
+string OutputInDepth(const unsigned long Depth, const char* Separator="  ");
 string URItoFileName(const string &URI);
 string TimeRFC1123(time_t Date);
 bool StrToTime(const string &Val,time_t &Result);
@@ -65,6 +66,7 @@ bool CheckDomainList(const string &Host, const string &List);
 int tolower_ascii(int c);
 
 #define APT_MKSTRCMP(name,func) \
+inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));}; \
 inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
 inline int name(string A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \
 inline int name(string A,string B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 55ba1f8c4..517b771a5 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -109,6 +109,8 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver)
       return false;
    if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Replaces) == false)
       return false;
+   if (ParseDepends(Ver,"Enhances",pkgCache::Dep::Enhances) == false)
+      return false;
 
    // Obsolete.
    if (ParseDepends(Ver,"Optional",pkgCache::Dep::Suggests) == false)
@@ -637,6 +639,8 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI,
       FileI->Version = WriteUniqString(Start,Stop - Start);
    if (Section.Find("Origin",Start,Stop) == true)
       FileI->Origin = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Codename",Start,Stop) == true)
+      FileI->Codename = WriteUniqString(Start,Stop - Start);
    if (Section.Find("Label",Start,Stop) == true)
       FileI->Label = WriteUniqString(Start,Stop - Start);
    if (Section.Find("Architecture",Start,Stop) == true)
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index ee035191f..f3ab6960c 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -115,6 +115,13 @@ debReleaseIndex::debReleaseIndex(string URI,string Dist)
    this->Type = "deb";
 }
 
+debReleaseIndex::~debReleaseIndex()
+{
+   for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin();
+	I != SectionEntries.end(); I++)
+      delete *I;
+}
+
 vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
 {
    vector <struct IndexTarget *>* IndexTargets = new vector <IndexTarget *>;
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index c021a1b5a..8e6a1463b 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -22,6 +22,7 @@ class debReleaseIndex : public metaIndex {
    public:
 
    debReleaseIndex(string URI, string Dist);
+   ~debReleaseIndex();
 
    virtual string ArchiveURI(string File) const {return URI + File;};
    virtual bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const;
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index ace4e00b5..2f87c767b 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -152,3 +152,11 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
    return true;
 }
 									/*}}}*/
+// SrcRecordParser::~SrcRecordParser - Destructor			/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+debSrcRecordParser::~debSrcRecordParser()
+{
+   delete[] Buffer;
+}
+									/*}}}*/
diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index 8b1237ccd..a3b5a8286 100644
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -50,6 +50,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser
    debSrcRecordParser(string File,pkgIndexFile const *Index) 
       : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), 
         Buffer(0), BufSize(0) {}
+   ~debSrcRecordParser();
 };
 
 #endif
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 82464d998..59f826d96 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -17,8 +17,8 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apti18n.h>    
-
+#include <apti18n.h>
+    
 #include <sys/types.h>
 #include <unistd.h>
 #include <dirent.h>
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 2411bfe89..13abbe5ed 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -15,6 +15,7 @@
 #include <apt-pkg/algorithms.h>
 
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/tagfile.h>
@@ -26,8 +27,8 @@
 #include <sys/stat.h>
 
 #include <apti18n.h>    
-
-// helper for Install-Recommends-Sections and Never-MarkAuto-Sections
+									/*}}}*/
+// helper for Install-Recommends-Sections and Never-MarkAuto-Sections	/*{{{*/
 static bool 
 ConfigValueInSubTree(const char* SubTree, const char *needle)
 {
@@ -46,9 +47,8 @@ ConfigValueInSubTree(const char* SubTree, const char *needle)
    }
    return false;
 }
-
-
-pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :
+									/*}}}*/
+pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :		/*{{{*/
   cache(cache), released(false)
 {
   ++cache.group_level;
@@ -76,13 +76,15 @@ pkgDepCache::ActionGroup::~ActionGroup()
 {
   release();
 }
-
+									/*}}}*/
 // DepCache::pkgDepCache - Constructors					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) :
   group_level(0), Cache(pCache), PkgState(0), DepState(0)
 {
+   DebugMarker = _config->FindB("Debug::pkgDepCache::Marker", false);
+   DebugAutoInstall = _config->FindB("Debug::pkgDepCache::AutoInstall", false);
    delLocalPolicy = 0;
    LocalPolicy = Plcy;
    if (LocalPolicy == 0)
@@ -127,7 +129,7 @@ bool pkgDepCache::Init(OpProgress *Prog)
    int Done = 0;
    for (PkgIterator I = PkgBegin(); I.end() != true; I++,Done++)
    {
-      if (Prog != 0)
+      if (Prog != 0 && Done%20 == 0)
 	 Prog->Progress(Done);
       
       // Find the proper cache slot
@@ -159,8 +161,7 @@ bool pkgDepCache::Init(OpProgress *Prog)
    return true;
 } 
 									/*}}}*/
-
-bool pkgDepCache::readStateFile(OpProgress *Prog)
+bool pkgDepCache::readStateFile(OpProgress *Prog)			/*{{{*/
 {
    FileFd state_file;
    string state = _config->FindDir("Dir::State") + "extended_states";
@@ -174,6 +175,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)
       pkgTagFile tagfile(&state_file);
       pkgTagSection section;
       int amt=0;
+      bool debug_autoremove=_config->FindB("Debug::pkgAutoRemove",false);
       while(tagfile.Step(section)) {
 	 string pkgname = section.FindS("Package");
 	 pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname);
@@ -183,7 +185,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)
 	    short reason = section.FindI("Auto-Installed", 0);
 	    if(reason > 0)
 	       PkgState[pkg->ID].Flags  |= Flag::Auto;
-	    if(_config->FindB("Debug::pkgAutoRemove",false))
+	    if(debug_autoremove)
 	       std::cout << "Auto-Installed : " << pkgname << std::endl;
 	    amt+=section.size();
 	    if(Prog != NULL)
@@ -198,10 +200,12 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)
 
    return true;
 }
-
-bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly)
+									/*}}}*/
+bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly)	/*{{{*/
 {
-   if(_config->FindB("Debug::pkgAutoRemove",false))
+   bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false);
+   
+   if(debug_autoremove)
       std::clog << "pkgDepCache::writeStateFile()" << std::endl;
 
    FileFd StateFile;
@@ -256,14 +260,14 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly)
    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))
+	    if(debug_autoremove)
 	       std::clog << "Skipping already written " << pkg.Name() << std::endl;
 	    continue;
 	 }
          // skip not installed ones if requested
          if(InstalledOnly && pkg->CurrentVer == 0)
             continue;
-	 if(_config->FindB("Debug::pkgAutoRemove",false))
+	 if(debug_autoremove)
 	    std::clog << "Writing new AutoInstall: " 
 		      << pkg.Name() << std::endl;
 	 ostr.str(string(""));
@@ -281,7 +285,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly)
 
    return true;
 }
-
+									/*}}}*/
 // DepCache::CheckDep - Checks a single dependency			/*{{{*/
 // ---------------------------------------------------------------------
 /* This first checks the dependency against the main target package and
@@ -699,13 +703,12 @@ void pkgDepCache::Update(PkgIterator const &Pkg)
 	   P.end() != true; P++)
 	 Update(P.ParentPkg().RevDependsList());
 }
-
 									/*}}}*/
-
 // DepCache::MarkKeep - Put the package in the keep state		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser)
+void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser,
+                           unsigned long Depth)
 {
    // Simplifies other routines.
    if (Pkg.end() == true)
@@ -746,6 +749,9 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser)
      P.Flags &= ~Flag::Auto;
 #endif
 
+   if (DebugMarker == true)
+      std::clog << OutputInDepth(Depth) << "MarkKeep " << Pkg << " FU=" << FromUser << std::endl;
+
    RemoveSizes(Pkg);
    RemoveStates(Pkg);
 
@@ -765,7 +771,8 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser)
 // DepCache::MarkDelete - Put the package in the delete state		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge)
+void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge,
+                             unsigned long Depth, bool FromUser)
 {
    // Simplifies other routines.
    if (Pkg.end() == true)
@@ -787,6 +794,13 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge)
    if (Pkg->VersionList == 0)
       return;
 
+   // check if we are allowed to install the package
+   if (IsDeleteOk(Pkg,rPurge,Depth,FromUser) == false)
+      return;
+
+   if (DebugMarker == true)
+      std::clog << OutputInDepth(Depth) << "MarkDelete " << Pkg << " FU=" << FromUser << std::endl;
+
    RemoveSizes(Pkg);
    RemoveStates(Pkg);
    
@@ -801,6 +815,23 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge)
    AddSizes(Pkg);
 }
 									/*}}}*/
+// DepCache::IsDeleteOk - check if it is ok to remove this package	/*{{{*/
+// ---------------------------------------------------------------------
+/* The default implementation just honors dpkg hold
+   But an application using this library can override this method
+   to control the MarkDelete behaviour */
+bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge,
+			      unsigned long Depth, bool FromUser)
+{
+   if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold)
+   {
+      if (DebugMarker == true)
+	 std::clog << OutputInDepth(Depth) << "Hold prevents MarkDelete of " << Pkg << " FU=" << FromUser << std::endl;
+      return false;
+   }
+   return true;
+}
+									/*}}}*/
 // DepCache::MarkInstall - Put the package in the install state		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -826,7 +857,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	P.CandidateVer == (Version *)Pkg.CurrentVer()))
    {
       if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0)
-	 MarkKeep(Pkg, false, FromUser);
+	 MarkKeep(Pkg, false, FromUser, Depth+1);
       return;
    }
 
@@ -836,6 +867,11 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
    // We dont even try to install virtual packages..
    if (Pkg->VersionList == 0)
       return;
+
+   // check if we are allowed to install the package
+   if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false)
+      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 */
@@ -864,10 +900,13 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
    AddStates(Pkg);
    Update(Pkg);
    AddSizes(Pkg);
-   
+
    if (AutoInst == false)
       return;
 
+   if (DebugMarker == true)
+      std::clog << OutputInDepth(Depth) << "MarkInstall " << Pkg << " FU=" << FromUser << std::endl;
+
    DepIterator Dep = P.InstVerIter(*this).DependsList();
    for (; Dep.end() != true;)
    {
@@ -937,12 +976,12 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	 }
       }
       if(isNewImportantDep)
-	 if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
-	    std::clog << "new important dependency: " 
+	 if(DebugAutoInstall == true)
+	    std::clog << OutputInDepth(Depth) << "new important dependency: "
 		      << Start.TargetPkg().Name() << std::endl;
       if(isPreviouslySatisfiedImportantDep)
-	if(_config->FindB("Debug::pkgDepCache::AutoInstall", false) == true)
-	  std::clog << "previously satisfied important dependency on "
+	if(DebugAutoInstall == true)
+	  std::clog << OutputInDepth(Depth) << "previously satisfied important dependency on "
 		    << Start.TargetPkg().Name() << std::endl;
 
       // skip important deps if the package is already installed
@@ -991,17 +1030,18 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	    }
 	 }
 	 
-	 if (InstPkg.end() == false) 
+	 if (InstPkg.end() == false)
 	 {
-	    if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
-	       std::clog << "Installing " << InstPkg.Name() 
-			 << " as dep of " << Pkg.Name() 
+	    if(DebugAutoInstall == true)
+	       std::clog << OutputInDepth(Depth) << "Installing " << InstPkg.Name()
+			 << " as " << Start.DepType() << " of " << Pkg.Name()
 			 << std::endl;
  	    // now check if we should consider it a automatic dependency or not
  	    if(Pkg.Section() && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", Pkg.Section()))
  	    {
- 	       if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
- 		  std::clog << "Setting NOT as auto-installed (direct dep of pkg in APT::Never-MarkAuto-Sections)" << std::endl;
+	       if(DebugAutoInstall == true)
+		  std::clog << OutputInDepth(Depth) << "Setting NOT as auto-installed (direct "
+                            << Start.DepType() << " of pkg in APT::Never-MarkAuto-Sections)" << std::endl;
  	       MarkInstall(InstPkg,true,Depth + 1, true);
  	    }
  	    else 
@@ -1028,16 +1068,32 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	    PkgIterator Pkg = Ver.ParentPkg();
 
 	    if (Start->Type != Dep::DpkgBreaks)
-	       MarkDelete(Pkg);
-	    else
-	       if (PkgState[Pkg->ID].CandidateVer != *I)
-		  MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps);
+	       MarkDelete(Pkg,false,Depth + 1, false);
+	    else if (PkgState[Pkg->ID].CandidateVer != *I)
+	       MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps);
 	 }
 	 continue;
       }      
    }
 }
 									/*}}}*/
+// DepCache::IsInstallOk - check if it is ok to install this package	/*{{{*/
+// ---------------------------------------------------------------------
+/* The default implementation just honors dpkg hold
+   But an application using this library can override this method
+   to control the MarkInstall behaviour */
+bool pkgDepCache::IsInstallOk(PkgIterator const &Pkg,bool AutoInst,
+			      unsigned long Depth, bool FromUser)
+{
+   if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold)
+   {
+      if (DebugMarker == true)
+	 std::clog << OutputInDepth(Depth) << "Hold prevents MarkInstall of " << Pkg << " FU=" << FromUser << std::endl;
+      return false;
+   }
+   return true;
+}
+									/*}}}*/
 // DepCache::SetReInstall - Set the reinstallation flag			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -1137,7 +1193,6 @@ const char *pkgDepCache::StateCache::StripEpoch(const char *Ver)
    return Ver;
 }
 									/*}}}*/
-
 // Policy::GetCandidateVer - Returns the Candidate install version	/*{{{*/
 // ---------------------------------------------------------------------
 /* The default just returns the highest available version that is not
@@ -1174,7 +1229,6 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg)
    return Last;
 }
 									/*}}}*/
-
 // Policy::IsImportantDep - True if the dependency is important		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -1200,8 +1254,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep)
    return false;
 }
 									/*}}}*/
-
-pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc()
+pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc()			/*{{{*/
   : constructedSuccessfully(false)
 {
   Configuration::Item const *Opts;
@@ -1230,8 +1283,8 @@ pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc()
 
   constructedSuccessfully = true;
 }
-
-pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc()
+									/*}}}*/
+pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc()			/*{{{*/
 {
   for(unsigned int i = 0; i < rootSetRegexp.size(); i++)
     {
@@ -1239,9 +1292,8 @@ pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc()
       delete rootSetRegexp[i];
     }
 }
-
-
-bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg)
+									/*}}}*/
+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)
@@ -1249,8 +1301,8 @@ bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg
 
    return false;
 }
-
-pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc()
+									/*}}}*/
+pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc()		/*{{{*/
 {
   DefaultRootSetFunc *f = new DefaultRootSetFunc;
   if(f->wasConstructedSuccessfully())
@@ -1261,7 +1313,7 @@ pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc()
       return NULL;
     }
 }
-
+									/*}}}*/
 bool pkgDepCache::MarkFollowsRecommends()
 {
   return _config->FindB("APT::AutoRemove::RecommendsImportant", true);
@@ -1272,11 +1324,12 @@ bool pkgDepCache::MarkFollowsSuggests()
   return _config->FindB("APT::AutoRemove::SuggestsImportant", false);
 }
 
-// the main mark algorithm
+// pkgDepCache::MarkRequired - the main mark algorithm			/*{{{*/
 bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
 {
    bool follow_recommends;
    bool follow_suggests;
+   bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false);
 
    // init the states
    for(PkgIterator p = PkgBegin(); !p.end(); ++p)
@@ -1285,8 +1338,7 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
       PkgState[p->ID].Garbage = false;
 
       // debug output
-      if(_config->FindB("Debug::pkgAutoRemove",false) 
-	 && PkgState[p->ID].Flags & Flag::Auto)
+      if(debug_autoremove && PkgState[p->ID].Flags & Flag::Auto)
   	 std::clog << "AutoDep: " << p.Name() << std::endl;
    }
 
@@ -1317,8 +1369,8 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
 
    return true;
 }
-
-// mark a single package in Mark-and-Sweep
+									/*}}}*/
+// MarkPackage - mark a single package in Mark-and-Sweep		/*{{{*/
 void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
 			      const pkgCache::VerIterator &ver,
 			      bool follow_recommends,
@@ -1357,7 +1409,9 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
    if(state.Marked)
       return;
 
-   if(_config->FindB("Debug::pkgAutoRemove",false))
+   bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove", false);
+   
+   if(debug_autoremove)
      {
        std::clog << "Marking: " << pkg.Name();
        if(!ver.end())
@@ -1388,7 +1442,7 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
 	   {
 	      if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer()))
 	      {
-		if(_config->FindB("Debug::pkgAutoRemove",false))
+		if(debug_autoremove)
 		  {
 		    std::clog << "Following dep: " << d.ParentPkg().Name()
 			      << " " << d.ParentVer().VerStr() << " "
@@ -1412,7 +1466,7 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
 	      if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp, 
 				       d.TargetVer()))
 	      {
-		if(_config->FindB("Debug::pkgAutoRemove",false))
+		if(debug_autoremove)
 		  {
 		    std::clog << "Following dep: " << d.ParentPkg().Name()
 			      << " " << d.ParentVer().VerStr() << " "
@@ -1437,12 +1491,14 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
      }
    }
 }
-
-bool pkgDepCache::Sweep()
+									/*}}}*/
+bool pkgDepCache::Sweep()						/*{{{*/
 {
+   bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false);
+
    // do the sweep
    for(PkgIterator p=PkgBegin(); !p.end(); ++p)
-  {
+   {
      StateCache &state=PkgState[p->ID];
 
      // skip required packages
@@ -1454,10 +1510,11 @@ bool pkgDepCache::Sweep()
      if(!state.Marked && (!p.CurrentVer().end() || state.Install()))
      {
 	state.Garbage=true;
-	if(_config->FindB("Debug::pkgAutoRemove",false))
+	if(debug_autoremove)
 	   std::cout << "Garbage: " << p.Name() << std::endl;
      }
   }   
 
    return true;
 }
+									/*}}}*/
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index f41ad17e9..0306861a1 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -294,7 +294,10 @@ class pkgDepCache : protected pkgCache::Namespace
    unsigned long iBrokenCount;
    unsigned long iPolicyBrokenCount;
    unsigned long iBadCount;
-   
+
+   bool DebugMarker;
+   bool DebugAutoInstall;
+
    Policy *delLocalPolicy;           // For memory clean up..
    Policy *LocalPolicy;
    
@@ -387,18 +390,58 @@ class pkgDepCache : protected pkgCache::Namespace
     */
    // @{
    void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
-		 bool FromUser = true);
-   void MarkDelete(PkgIterator const &Pkg,bool Purge = false);
+		 bool FromUser = true, unsigned long Depth = 0);
+   void MarkDelete(PkgIterator const &Pkg, bool Purge = false,
+                   unsigned long Depth = 0, bool FromUser = true);
    void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
 		    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);
    // @}
-   
+
+   /** \return \b true if it's OK for MarkInstall to install
+    *  the given package.
+    *
+    *  See the default implementation for a simple example how this
+    *  method can be used.
+    *  Overriding implementations should use the hold-state-flag to cache
+    *  results from previous checks of this package - also it should
+    *  be used if the default resolver implementation is also used to
+    *  ensure that these packages are handled like "normal" dpkg holds.
+    *
+    *  The parameters are the same as in the calling MarkInstall:
+    *  \param Pkg       the package that MarkInstall wants to install.
+    *  \param AutoInst  needs a previous MarkInstall this package?
+    *  \param Depth     recursive deep of this Marker call
+    *  \param FromUser  was the install requested by the user?
+    */
+   virtual bool IsInstallOk(const PkgIterator &Pkg,bool AutoInst = true,
+			    unsigned long Depth = 0, bool FromUser = true);
+
+   /** \return \b true if it's OK for MarkDelete to remove
+    *  the given package.
+    *
+    *  See the default implementation for a simple example how this
+    *  method can be used.
+    *  Overriding implementations should use the hold-state-flag to cache
+    *  results from previous checks of this package - also it should
+    *  be used if the default resolver implementation is also used to
+    *  ensure that these packages are handled like "normal" dpkg holds.
+    *
+    *  The parameters are the same as in the calling MarkDelete:
+    *  \param Pkg       the package that MarkDelete wants to remove.
+    *  \param Purge     should we purge instead of "only" remove?
+    *  \param Depth     recursive deep of this Marker call
+    *  \param FromUser  was the remove requested by the user?
+    */
+   virtual bool IsDeleteOk(const PkgIterator &Pkg,bool Purge = false,
+			    unsigned long Depth = 0, bool FromUser = true);
+
    // This is for debuging
    void Update(OpProgress *Prog = 0);
 
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 5a92c79b7..15696585a 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -551,8 +551,8 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
 
    return true;
 }
-
-bool SigVerify::CopyMetaIndex(string CDROM, string CDName, 
+									/*}}}*/
+bool SigVerify::CopyMetaIndex(string CDROM, string CDName,		/*{{{*/
 			      string prefix, string file)
 {
       char S[400];
@@ -572,8 +572,8 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName,
    
       return true;
 }
-
-bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
+									/*}}}*/
+bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,	/*{{{*/
 			      vector<string> PkgList,vector<string> SrcList)
 {
    if (SigList.size() == 0)
@@ -675,10 +675,9 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 
    return true;
 }
-
-
-bool TranslationsCopy::CopyTranslations(string CDROM,string Name,vector<string> &List,
-			     pkgCdromStatus *log)
+									/*}}}*/
+bool TranslationsCopy::CopyTranslations(string CDROM,string Name,	/*{{{*/
+				vector<string> &List, pkgCdromStatus *log)
 {
    OpProgress *Progress = NULL;
    if (List.size() == 0)
@@ -850,3 +849,4 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,vector<string>
 
    return true;
 }
+									/*}}}*/
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 7778ae595..9e5ad4e43 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -22,7 +22,7 @@ class FileFd;
 class indexRecords;
 class pkgCdromStatus;
 
-class IndexCopy
+class IndexCopy								/*{{{*/
 {
    protected:
    
@@ -45,8 +45,8 @@ class IndexCopy
 		     pkgCdromStatus *log);
    virtual ~IndexCopy() {};
 };
-
-class PackageCopy : public IndexCopy
+									/*}}}*/
+class PackageCopy : public IndexCopy					/*{{{*/
 {
    protected:
    
@@ -57,8 +57,8 @@ class PackageCopy : public IndexCopy
    
    public:
 };
-
-class SourceCopy : public IndexCopy
+									/*}}}*/
+class SourceCopy : public IndexCopy					/*{{{*/
 {
    protected:
    
@@ -69,8 +69,8 @@ class SourceCopy : public IndexCopy
    
    public:
 };
-
-class TranslationsCopy
+									/*}}}*/
+class TranslationsCopy							/*{{{*/
 {
    protected:
    pkgTagSection *Section;
@@ -79,9 +79,8 @@ class TranslationsCopy
    bool CopyTranslations(string CDROM,string Name,vector<string> &List,
 			 pkgCdromStatus *log);
 };
-
-
-class SigVerify 
+									/*}}}*/
+class SigVerify								/*{{{*/
 {
    bool Verify(string prefix,string file, indexRecords *records);
    bool CopyMetaIndex(string CDROM, string CDName, 
@@ -91,7 +90,6 @@ class SigVerify
    bool CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 		      vector<string> PkgList,vector<string> SrcList);
 };
-
-
+									/*}}}*/
 
 #endif
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index b38596143..08f71feb0 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -41,7 +41,6 @@ pkgIndexFile::Type *pkgIndexFile::Type::GetType(const char *Type)
    return 0;
 }
 									/*}}}*/
-    
 // IndexFile::ArchiveInfo - Stub					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index ab208e246..1fc27b1a1 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -9,7 +9,7 @@
 #include <apt-pkg/strutl.h>
 #include <apti18n.h>
 #include <sys/stat.h>
-
+									/*}}}*/
 string indexRecords::GetDist() const
 {
    return this->Dist;
@@ -31,7 +31,7 @@ const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
    return Entries[MetaKey];
 }
 
-bool indexRecords::Load(const string Filename)
+bool indexRecords::Load(const string Filename)				/*{{{*/
 {
    FileFd Fd(Filename, FileFd::ReadOnly);
    pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX
@@ -85,8 +85,8 @@ bool indexRecords::Load(const string Filename)
    string Strdate = Section.FindS("Date"); // FIXME: verify this somehow?
    return true;
 }
-
-vector<string> indexRecords::MetaKeys()
+									/*}}}*/
+vector<string> indexRecords::MetaKeys()					/*{{{*/
 {
    std::vector<std::string> keys;
    std::map<string,checkSum *>::iterator I = Entries.begin();
@@ -96,8 +96,8 @@ vector<string> indexRecords::MetaKeys()
    }
    return keys;
 }
-
-bool indexRecords::parseSumData(const char *&Start, const char *End,
+									/*}}}*/
+bool indexRecords::parseSumData(const char *&Start, const char *End,	/*{{{*/
 				   string &Name, string &Hash, size_t &Size)
 {
    Name = "";
@@ -154,7 +154,7 @@ bool indexRecords::parseSumData(const char *&Start, const char *End,
    Start = EntryEnd; //prepare for the next round
    return true;
 }
-
+									/*}}}*/
 indexRecords::indexRecords()
 {
 }
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 338bef66c..63caade36 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -67,6 +67,7 @@ bool pkgInitConfig(Configuration &Cnf)
    Cnf.Set("Dir::Etc::main","apt.conf");
    Cnf.Set("Dir::Etc::parts","apt.conf.d");
    Cnf.Set("Dir::Etc::preferences","preferences");
+   Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
    Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
 
    // State   
@@ -80,19 +81,26 @@ bool pkgInitConfig(Configuration &Cnf)
    
    // Read an alternate config file
    const char *Cfg = getenv("APT_CONFIG");
-   if (Cfg != 0 && FileExists(Cfg) == true)
-      Res &= ReadConfigFile(Cnf,Cfg);
-   
+   if (Cfg != 0)
+   {
+      if (FileExists(Cfg) == true)
+	 Res &= ReadConfigFile(Cnf,Cfg);
+      else
+	 _error->WarningE("FileExists",_("Unable to read %s"),Cfg);
+   }
+
    // Read the configuration parts dir
    string Parts = Cnf.FindDir("Dir::Etc::parts");
    if (FileExists(Parts) == true)
       Res &= ReadConfigDir(Cnf,Parts);
-      
+   else
+      _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str());
+
    // Read the main config file
    string FName = Cnf.FindFile("Dir::Etc::main");
    if (FileExists(FName) == true)
       Res &= ReadConfigFile(Cnf,FName);
-   
+
    if (Res == false)
       return false;
    
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index 6d8693be9..165299253 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -18,7 +18,7 @@
 
 // See the makefile
 #define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 6
+#define APT_PKG_MINOR 8
 #define APT_PKG_RELEASE 0
     
 extern const char *pkgVersion;
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 087f17740..92ef58967 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -13,9 +13,9 @@ include ../buildlib/defaults.mak
 # methods/makefile - FIXME
 LIBRARY=apt-pkg
 LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=4.7
+MAJOR=4.8
 MINOR=0
-SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil
+SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl
 APT_DOMAIN:=libapt-pkg$(MAJOR)
 
 # Source code for the contributed non-core things
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 2b87d7da9..779b6ab14 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -39,7 +39,13 @@ class metaIndex
    virtual vector<pkgIndexFile *> *GetIndexFiles() = 0; 
    virtual bool IsTrusted() const = 0;
 
-   virtual ~metaIndex() {};
+   virtual ~metaIndex() {
+      if (Indexes == 0)
+	 return;
+      for (vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I)
+	 delete *I;
+      delete Indexes;
+   }
 };
 
 #endif
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index ca18f1d75..01b150722 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -129,7 +129,6 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg)
    return true;
 }
 									/*}}}*/
-
 // OrderList::DoRun - Does an order run					/*{{{*/
 // ---------------------------------------------------------------------
 /* The caller is expeted to have setup the desired probe state */
@@ -282,7 +281,6 @@ bool pkgOrderList::OrderConfigure()
    return DoRun();
 }
 									/*}}}*/
-
 // OrderList::Score - Score the package for sorting			/*{{{*/
 // ---------------------------------------------------------------------
 /* Higher scores order earlier */
@@ -433,7 +431,6 @@ int pkgOrderList::OrderCompareB(const void *a, const void *b)
    return strcmp(A.Name(),B.Name());
 }
 									/*}}}*/
-
 // OrderList::VisitDeps - Visit forward install dependencies		/*{{{*/
 // ---------------------------------------------------------------------
 /* This calls the dependency function for the normal forwards dependencies
@@ -590,7 +587,6 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg)
    return true;
 }
 									/*}}}*/
-
 // OrderList::DepUnPackCrit - Critical UnPacking ordering		/*{{{*/
 // ---------------------------------------------------------------------
 /* Critical unpacking ordering strives to satisfy Conflicts: and 
@@ -668,13 +664,12 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D)
    }   
    return true;
 }
-
+									/*}}}*/
 // OrderList::DepUnPackPreD - Critical UnPacking ordering with depends	/*{{{*/
 // ---------------------------------------------------------------------
 /* Critical PreDepends (also configure immediate and essential) strives to
    ensure not only that all conflicts+predepends are met but that this
-   package will be immediately configurable when it is unpacked. 
-
+   package will be immediately configurable when it is unpacked.
    Loops are preprocessed and logged. */
 bool pkgOrderList::DepUnPackPreD(DepIterator D)
 {
@@ -892,7 +887,6 @@ bool pkgOrderList::DepRemove(DepIterator D)
    return true;
 }
 									/*}}}*/
-
 // OrderList::AddLoop - Add a loop to the loop list			/*{{{*/
 // ---------------------------------------------------------------------
 /* We record the loops. This is a relic since loop breaking is done 
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 304d1c653..cc9ce21c7 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -26,7 +26,7 @@
 #include <apti18n.h>    
 #include <iostream>
 #include <fcntl.h> 
-
+									/*}}}*/
 using namespace std;
 
 // PM::PackageManager - Constructor					/*{{{*/
@@ -117,7 +117,6 @@ bool pkgPackageManager::FixMissing()
    return Resolve.ResolveByKeep() == true && Cache.BrokenCount() == 0;   
 }
 									/*}}}*/
-
 // PM::ImmediateAdd - Add the immediate flag recursivly			/*{{{*/
 // ---------------------------------------------------------------------
 /* This adds the immediate flag to the pkg and recursively to the
@@ -152,7 +151,6 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer)
    return;
 }
 									/*}}}*/
-
 // PM::CreateOrderList - Create the ordering class			/*{{{*/
 // ---------------------------------------------------------------------
 /* This populates the ordering list with all the packages that are
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 6687864ee..2a9756c45 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -21,6 +21,7 @@
 									/*}}}*/
 // Include Files							/*{{{*/
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/policy.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/error.h>
@@ -49,7 +50,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 = 7;
+   MajorVersion = 8;
    MinorVersion = 0;
    Dirty = false;
    
@@ -223,7 +224,7 @@ const char *pkgCache::DepType(unsigned char Type)
 {
    const char *Types[] = {"",_("Depends"),_("PreDepends"),_("Suggests"),
                           _("Recommends"),_("Conflicts"),_("Replaces"),
-                          _("Obsoletes"),_("Breaks")};
+                          _("Obsoletes"),_("Breaks"), _("Enhances")};
    if (Type < sizeof(Types)/sizeof(*Types))
       return Types[Type];
    return "";
@@ -290,6 +291,56 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
    return NeedsNothing;
 }
 									/*}}}*/
+// PkgIterator::CandVersion - Returns the candidate version string	/*{{{*/
+// ---------------------------------------------------------------------
+/* Return string representing of the candidate version. */
+const char *
+pkgCache::PkgIterator::CandVersion() const 
+{
+  //TargetVer is empty, so don't use it.
+  VerIterator version = pkgPolicy::pkgPolicy(Owner).GetCandidateVer(*this);
+  if (version.IsGood())
+    return version.VerStr();
+  return 0;
+};
+									/*}}}*/
+// PkgIterator::CurVersion - Returns the current version string		/*{{{*/
+// ---------------------------------------------------------------------
+/* Return string representing of the current version. */
+const char *
+pkgCache::PkgIterator::CurVersion() const 
+{
+  VerIterator version = CurrentVer();
+  if (version.IsGood())
+    return CurrentVer().VerStr();
+  return 0;
+};
+									/*}}}*/
+// ostream operator to handle string representation of a package	/*{{{*/
+// ---------------------------------------------------------------------
+/* Output name < cur.rent.version -> candid.ate.version | new.est.version > (section)
+   Note that the characters <|>() are all literal above. Versions will be ommited
+   if they provide no new information (e.g. there is no newer version than candidate)
+   If no version and/or section can be found "none" is used. */
+std::ostream& 
+operator<<(ostream& out, pkgCache::PkgIterator Pkg) 
+{
+   if (Pkg.end() == true)
+      return out << "invalid package";
+
+   string current = string(Pkg.CurVersion() == 0 ? "none" : Pkg.CurVersion());
+   string candidate = string(Pkg.CandVersion() == 0 ? "none" : Pkg.CandVersion());
+   string newest = string(Pkg.VersionList().end() ? "none" : Pkg.VersionList().VerStr());
+
+   out << Pkg.Name() << " < " << current;
+   if (current != candidate)
+      out << " -> " << candidate;
+   if ( newest != "none" && candidate != newest)
+      out << " | " << newest;
+   out << " > ( " << string(Pkg.Section()==0?"none":Pkg.Section()) << " )";
+   return out;
+}
+									/*}}}*/
 // DepIterator::IsCritical - Returns true if the dep is important	/*{{{*/
 // ---------------------------------------------------------------------
 /* Currently critical deps are defined as depends, predepends and
@@ -607,6 +658,8 @@ string pkgCache::PkgFileIterator::RelStr()
       Res = Res + (Res.empty() == true?"o=":",o=")  + Origin();
    if (Archive() != 0)
       Res = Res + (Res.empty() == true?"a=":",a=")  + Archive();
+   if (Codename() != 0)
+      Res = Res + (Res.empty() == true?"n=":",n=")  + Codename();
    if (Label() != 0)
       Res = Res + (Res.empty() == true?"l=":",l=")  + Label();
    if (Component() != 0)
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 759e9a225..38733713f 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -27,7 +27,7 @@
 using std::string;
     
 class pkgVersioningSystem;
-class pkgCache
+class pkgCache								/*{{{*/
 {
    public:
    // Cache element predeclarations
@@ -70,7 +70,7 @@ class pkgCache
    struct Dep
    {
       enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4,
-	 Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8};
+	 Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8,Enhances=9};
       enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3,
 	 Greater=0x4,Equals=0x5,NotEquals=0x6};
    };
@@ -146,8 +146,8 @@ class pkgCache
    pkgCache(MMap *Map,bool DoMap = true);
    virtual ~pkgCache() {};
 };
-
-// Header structure
+									/*}}}*/
+// Header structure							/*{{{*/
 struct pkgCache::Header
 {
    // Signature information
@@ -195,8 +195,8 @@ struct pkgCache::Header
    bool CheckSizes(Header &Against) const;
    Header();
 };
-
-struct pkgCache::Package
+									/*}}}*/
+struct pkgCache::Package						/*{{{*/
 {
    // Pointers
    map_ptrloc Name;              // Stringtable
@@ -217,12 +217,13 @@ struct pkgCache::Package
    unsigned int ID;
    unsigned long Flags;
 };
-
-struct pkgCache::PackageFile
+									/*}}}*/
+struct pkgCache::PackageFile						/*{{{*/
 {
    // Names
    map_ptrloc FileName;        // Stringtable
    map_ptrloc Archive;         // Stringtable
+   map_ptrloc Codename;        // Stringtable
    map_ptrloc Component;       // Stringtable
    map_ptrloc Version;         // Stringtable
    map_ptrloc Origin;          // Stringtable
@@ -238,24 +239,24 @@ struct pkgCache::PackageFile
    unsigned int ID;
    time_t mtime;                  // Modification time for the file
 };
-
-struct pkgCache::VerFile
+									/*}}}*/
+struct pkgCache::VerFile						/*{{{*/
 {
    map_ptrloc File;           // PackageFile
    map_ptrloc NextFile;       // PkgVerFile
    map_ptrloc Offset;         // File offset
    unsigned short Size;
 };
-
-struct pkgCache::DescFile
+									/*}}}*/
+struct pkgCache::DescFile						/*{{{*/
 {
    map_ptrloc File;           // PackageFile
    map_ptrloc NextFile;       // PkgVerFile
    map_ptrloc Offset;         // File offset
    unsigned short Size;
 };
-
-struct pkgCache::Version
+									/*}}}*/
+struct pkgCache::Version						/*{{{*/
 {
    map_ptrloc VerStr;            // Stringtable
    map_ptrloc Section;           // StringTable (StringItem)
@@ -275,8 +276,8 @@ struct pkgCache::Version
    unsigned int ID;
    unsigned char Priority;
 };
-
-struct pkgCache::Description
+									/*}}}*/
+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
@@ -291,8 +292,8 @@ struct pkgCache::Description
 
    unsigned int ID;
 };
-
-struct pkgCache::Dependency
+									/*}}}*/
+struct pkgCache::Dependency						/*{{{*/
 {
    map_ptrloc Version;         // Stringtable
    map_ptrloc Package;         // Package
@@ -305,8 +306,8 @@ struct pkgCache::Dependency
    unsigned char Type;
    unsigned char CompareOp;
 };
-
-struct pkgCache::Provides
+									/*}}}*/
+struct pkgCache::Provides						/*{{{*/
 {
    map_ptrloc ParentPkg;        // Pacakge
    map_ptrloc Version;          // Version
@@ -314,13 +315,13 @@ struct pkgCache::Provides
    map_ptrloc NextProvides;     // Provides
    map_ptrloc NextPkgProv;      // Provides
 };
-
-struct pkgCache::StringItem
+									/*}}}*/
+struct pkgCache::StringItem						/*{{{*/
 {
    map_ptrloc String;        // Stringtable
    map_ptrloc NextItem;      // StringItem
 };
-
+									/*}}}*/
 #include <apt-pkg/cacheiterators.h>
 
 inline pkgCache::PkgIterator pkgCache::PkgBegin() 
@@ -333,7 +334,7 @@ inline pkgCache::PkgFileIterator pkgCache::FileEnd()
        {return PkgFileIterator(*this,PkgFileP);};
 
 // Oh I wish for Real Name Space Support
-class pkgCache::Namespace
+class pkgCache::Namespace						/*{{{*/
 {   
    public:
 
@@ -351,5 +352,5 @@ class pkgCache::Namespace
    typedef pkgCache::Dep Dep;
    typedef pkgCache::Flag Flag;
 };
-
+									/*}}}*/
 #endif
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 397c19829..68180c702 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -53,14 +53,16 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
    {
       // Setup the map interface..
       Cache.HeaderP = (pkgCache::Header *)Map.Data();
-      Map.RawAllocate(sizeof(pkgCache::Header));
+      if (Map.RawAllocate(sizeof(pkgCache::Header)) == 0 && _error->PendingError() == true)
+	 return;
+
       Map.UsePools(*Cache.HeaderP->Pools,sizeof(Cache.HeaderP->Pools)/sizeof(Cache.HeaderP->Pools[0]));
-      
+
       // Starting header
       *Cache.HeaderP = pkgCache::Header();
       Cache.HeaderP->VerSysName = Map.WriteString(_system->VS->Label);
       Cache.HeaderP->Architecture = Map.WriteString(_config->Find("APT::Architecture"));
-      Cache.ReMap(); 
+      Cache.ReMap();
    }
    else
    {
@@ -135,7 +137,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
  	 pkgCache::VerIterator Ver = Pkg.VersionList();
  	 map_ptrloc *LastVer = &Pkg->VersionList;
 
-  	 for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) 
+	 for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
  	 {
  	    pkgCache::DescIterator Desc = Ver.DescriptionList();
  	    map_ptrloc *LastDesc = &Ver->DescriptionList;
@@ -143,7 +145,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
 
 	    // don't add a new description if we have one for the given
 	    // md5 && language
- 	    for ( ; Desc.end() == false; Desc++)
+	    for ( ; Desc.end() == false; Desc++)
 	       if (MD5SumValue(Desc.md5()) == CurMd5 && 
 	           Desc.LanguageCode() == List.DescriptionLanguage())
 		  duplicate=true;
@@ -151,7 +153,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
 	       continue;
 	    
  	    for (Desc = Ver.DescriptionList();
-		 Desc.end() == false; 
+		 Desc.end() == false;
 		 LastDesc = &Desc->NextDesc, Desc++)
 	    {
  	       if (MD5SumValue(Desc.md5()) == CurMd5) 
@@ -160,7 +162,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
  		  *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc);
  		  Desc->ParentPkg = Pkg.Index();
 		  
- 		  if (NewFileDesc(Desc,List) == false)
+		  if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
  		     return _error->Error(_("Error occurred while processing %s (NewFileDesc1)"),PackageName.c_str());
  		  break;
  	       }
@@ -220,7 +222,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       Ver->ParentPkg = Pkg.Index();
       Ver->Hash = Hash;
 
-      if (List.NewVersion(Ver) == false)
+      if ((*LastVer == 0 && _error->PendingError()) || List.NewVersion(Ver) == false)
 	 return _error->Error(_("Error occurred while processing %s (NewVersion1)"),
 			      PackageName.c_str());
 
@@ -252,7 +254,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc);
       Desc->ParentPkg = Pkg.Index();
 
-      if (NewFileDesc(Desc,List) == false)
+      if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
 	 return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),PackageName.c_str());
    }
 
@@ -419,7 +421,7 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
    // Get a structure
    unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile));
    if (DescFile == 0)
-      return 0;
+      return false;
 
    pkgCache::DescFileIterator DF(Cache,Cache.DescFileP + DescFile);
    DF->File = CurrentFile - Cache.PkgFileP;
@@ -460,6 +462,8 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
    Desc->ID = Cache.HeaderP->DescriptionCount++;
    Desc->language_code = Map.WriteString(Lang);
    Desc->md5sum = Map.WriteString(md5sum.Value());
+   if (Desc->language_code == 0 || Desc->md5sum == 0)
+      return 0;
 
    return Description;
 }
@@ -652,7 +656,6 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
    return ItemP->String;
 }
 									/*}}}*/
-
 // CheckValidity - Check that a cache is up-to-date			/*{{{*/
 // ---------------------------------------------------------------------
 /* This just verifies that each file in the list of index files exists,
@@ -667,7 +670,7 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start,
    
    // Map it
    FileFd CacheF(CacheFile,FileFd::ReadOnly);
-   SPtr<MMap> Map = new MMap(CacheF,MMap::Public | MMap::ReadOnly);
+   SPtr<MMap> Map = new MMap(CacheF,0);
    pkgCache Cache(Map);
    if (_error->PendingError() == true || Map->Size() == 0)
    {
@@ -810,7 +813,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
    unsigned long EndOfSource = Files.size();
    if (_system->AddStatusFiles(Files) == false)
       return false;
-   
+
    // Decide if we can write to the files..
    string CacheFile = _config->FindFile("Dir::Cache::pkgcache");
    string SrcCacheFile = _config->FindFile("Dir::Cache::srcpkgcache");
@@ -851,7 +854,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
    else
    {
       // Just build it in memory..
-      Map = new DynamicMMap(MMap::Public,MapSize);
+      Map = new DynamicMMap(0,MapSize);
    }
    
    // Lets try the source cache.
@@ -862,8 +865,10 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
    {
       // Preload the map with the source cache
       FileFd SCacheF(SrcCacheFile,FileFd::ReadOnly);
-      if (SCacheF.Read((unsigned char *)Map->Data() + Map->RawAllocate(SCacheF.Size()),
-		       SCacheF.Size()) == false)
+      unsigned long alloc = Map->RawAllocate(SCacheF.Size());
+      if ((alloc == 0 && _error->PendingError())
+		|| SCacheF.Read((unsigned char *)Map->Data() + alloc,
+				SCacheF.Size()) == false)
 	 return false;
 
       TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
@@ -924,7 +929,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
       if (CacheF != 0)
       {
 	 delete Map.UnGuard();
-	 *OutMap = new MMap(*CacheF,MMap::Public | MMap::ReadOnly);
+	 *OutMap = new MMap(*CacheF,0);
       }
       else
       {
@@ -946,8 +951,7 @@ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
    if (_system->AddStatusFiles(Files) == false)
       return false;
    
-   SPtr<DynamicMMap> Map;   
-   Map = new DynamicMMap(MMap::Public,MapSize);
+   SPtr<DynamicMMap> Map = new DynamicMMap(0,MapSize);
    unsigned long CurrentSize = 0;
    unsigned long TotalSize = 0;
    
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index b6715294a..108b34207 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -28,7 +28,7 @@ class OpProgress;
 class MMap;
 class pkgIndexFile;
 
-class pkgCacheGenerator
+class pkgCacheGenerator							/*{{{*/
 {
    private:
    
@@ -76,8 +76,8 @@ class pkgCacheGenerator
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
    ~pkgCacheGenerator();
 };
-
-// This is the abstract package list parser class.
+									/*}}}*/
+// This is the abstract package list parser class.			/*{{{*/
 class pkgCacheGenerator::ListParser
 {
    pkgCacheGenerator *Owner;
@@ -126,7 +126,7 @@ class pkgCacheGenerator::ListParser
    ListParser() : FoundFileDeps(false) {};
    virtual ~ListParser() {};
 };
-
+									/*}}}*/
 bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
 			MMap **OutMap = 0,bool AllowMem = false);
 bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap);
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 17f3b1569..c2c98188a 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -22,7 +22,7 @@
 #include <apt-pkg/fileutl.h>
 #include <vector>
 
-class pkgRecords
+class pkgRecords							/*{{{*/
 {
    public:
    class Parser;
@@ -42,8 +42,8 @@ class pkgRecords
    pkgRecords(pkgCache &Cache);
    ~pkgRecords();
 };
-
-class pkgRecords::Parser
+									/*}}}*/
+class pkgRecords::Parser						/*{{{*/
 {
    protected:
    
@@ -73,5 +73,5 @@ class pkgRecords::Parser
    
    virtual ~Parser() {};
 };
-
+									/*}}}*/
 #endif
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 8b083fd44..81fdb0431 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -32,6 +32,9 @@
     
 #include <apti18n.h>
 
+#include <dirent.h>
+#include <sys/stat.h>
+#include <algorithm>
 #include <iostream>
 #include <sstream>
 									/*}}}*/
@@ -120,6 +123,14 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
    signed Max = GetPriority(Pkg);
    pkgCache::VerIterator Pref = GetMatch(Pkg);
 
+   // no package = no candidate version
+   if (Pkg.end() == true)
+      return Pref;
+
+   // packages with a pin lower than 0 have no newer candidate than the current version
+   if (Max < 0)
+      return Pkg.CurrentVer();
+
    /* Falling through to the default version.. Setting Max to zero
       effectively excludes everything <= 0 which are the non-automatic
       priorities.. The status file is given a prio of 100 which will exclude
@@ -239,7 +250,76 @@ signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)
    return 0;
 }
 									/*}}}*/
+// PreferenceSection class - Overriding the default TrimRecord method	/*{{{*/
+// ---------------------------------------------------------------------
+/* The preference file is a user generated file so the parser should
+   therefore be a bit more friendly by allowing comments and new lines
+   all over the place rather than forcing a special format */
+class PreferenceSection : public pkgTagSection
+{
+   void TrimRecord(bool BeforeRecord, const char* &End)
+   {
+      for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r' || Stop[0] == '#'); Stop++)
+	 if (Stop[0] == '#')
+	    Stop = (const char*) memchr(Stop,'\n',End-Stop);
+   }
+};
+									/*}}}*/
+// ReadPinDir - Load the pin files from this dir into a Policy		/*{{{*/
+// ---------------------------------------------------------------------
+/* This will load each pin file in the given dir into a Policy. If the
+   given dir is empty the dir set in Dir::Etc::PreferencesParts is used.
+   Note also that this method will issue a warning if the dir does not
+   exists but it will return true in this case! */
+bool ReadPinDir(pkgPolicy &Plcy,string Dir)
+{
+   if (Dir.empty() == true)
+      Dir = _config->FindDir("Dir::Etc::PreferencesParts");
+
+   if (FileExists(Dir) == false)
+   {
+      _error->WarningE("FileExists",_("Unable to read %s"),Dir.c_str());
+      return true;
+   }
+
+   DIR *D = opendir(Dir.c_str());
+   if (D == 0)
+      return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
+
+   vector<string> List;
 
+   for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D))
+   {
+      if (Ent->d_name[0] == '.')
+	 continue;
+
+      // Skip bad file names ala run-parts
+      const char *C = Ent->d_name;
+      for (; *C != 0; C++)
+	 if (isalpha(*C) == 0 && isdigit(*C) == 0 && *C != '_' && *C != '-')
+	    break;
+      if (*C != 0)
+	 continue;
+
+      // Make sure it is a file and not something else
+      string File = flCombine(Dir,Ent->d_name);
+      struct stat St;
+      if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0)
+	 continue;
+
+      List.push_back(File);
+   }
+   closedir(D);
+
+   sort(List.begin(),List.end());
+
+   // Read the files
+   for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
+      if (ReadPinFile(Plcy, *I) == false)
+	 return false;
+   return true;
+}
+									/*}}}*/
 // ReadPinFile - Load the pin file into a Policy			/*{{{*/
 // ---------------------------------------------------------------------
 /* I'd like to see the preferences file store more than just pin information
@@ -259,12 +339,12 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
    if (_error->PendingError() == true)
       return false;
    
-   pkgTagSection Tags;
+   PreferenceSection Tags;
    while (TF.Step(Tags) == true)
    {
       string Name = Tags.FindS("Package");
       if (Name.empty() == true)
-	 return _error->Error(_("Invalid record in the preferences file, no Package header"));
+	 return _error->Error(_("Invalid record in the preferences file %s, no Package header"), File.c_str());
       if (Name == "*")
 	 Name = string();
       
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index d5f3b2f75..4894682fa 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -84,5 +84,6 @@ class pkgPolicy : public pkgDepCache::Policy
 };
 
 bool ReadPinFile(pkgPolicy &Plcy,string File = "");
+bool ReadPinDir(pkgPolicy &Plcy,string Dir = "");
 
 #endif
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index fea645078..47a08ad90 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -158,12 +158,16 @@ bool pkgSourceList::ReadMainList()
    //                  entries in sources.list.d.
    string Main = _config->FindFile("Dir::Etc::sourcelist");
    if (FileExists(Main) == true)
-      Res &= ReadAppend(Main);   
+      Res &= ReadAppend(Main);
+   else
+      _error->WarningE("FileExists",_("Unable to read %s"),Main.c_str());
 
    string Parts = _config->FindDir("Dir::Etc::sourceparts");
    if (FileExists(Parts) == true)
       Res &= ReadSourceDir(Parts);
-   
+   else
+      _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str());
+
    return Res;
 }
 									/*}}}*/
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 893cb8ee7..7c5d15a58 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -81,7 +81,7 @@ bool pkgTagFile::Resize()
    End = Start + EndSize;
    return true;
 }
-
+									/*}}}*/
 // TagFile::Step - Advance to the next section				/*{{{*/
 // ---------------------------------------------------------------------
 /* If the Section Scanner fails we refill the buffer and try again. 
@@ -212,10 +212,12 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
 
    if (Stop == 0)
       return false;
-   
+
    TagCount = 0;
    while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
    {
+       TrimRecord(true,End);
+
       // Start a new index and add it to the hash
       if (isspace(Stop[0]) == 0)
       {
@@ -227,14 +229,14 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
       
       if (Stop == 0)
 	 return false;
-      
+
       for (; Stop+1 < End && Stop[1] == '\r'; Stop++);
 
       // Double newline marks the end of the record
       if (Stop+1 < End && Stop[1] == '\n')
       {
 	 Indexes[TagCount] = Stop - Section;
-	 for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++);
+	 TrimRecord(false,End);
 	 return true;
       }
       
@@ -244,6 +246,16 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
    return false;
 }
 									/*}}}*/
+// TagSection::TrimRecord - Trim off any garbage before/after a record	/*{{{*/
+// ---------------------------------------------------------------------
+/* There should be exactly 2 newline at the end of the record, no more. */
+void pkgTagSection::TrimRecord(bool BeforeRecord, const char*& End)
+{
+   if (BeforeRecord == true)
+      return;
+   for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++);
+}
+									/*}}}*/
 // TagSection::Trim - Trim off any trailing garbage			/*{{{*/
 // ---------------------------------------------------------------------
 /* There should be exactly 1 newline at the end of the buffer, no more. */
@@ -390,7 +402,6 @@ bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
    return true;
 }
 									/*}}}*/
-
 // TFRewrite - Rewrite a control record					/*{{{*/
 // ---------------------------------------------------------------------
 /* This writes the control record to stdout rewriting it as necessary. The
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 6536932dd..321329a23 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -27,7 +27,6 @@
 class pkgTagSection
 {
    const char *Section;
-   const char *Stop;
    
    // We have a limit of 256 tags per section.
    unsigned int Indexes[256];
@@ -35,6 +34,9 @@ class pkgTagSection
    
    unsigned int TagCount;
      
+   protected:
+   const char *Stop;
+
    public:
    
    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
@@ -49,6 +51,7 @@ class pkgTagSection
    bool Scan(const char *Start,unsigned long MaxLength);
    inline unsigned long size() const {return Stop - Section;};
    void Trim();
+   virtual void TrimRecord(bool BeforeRecord, const char* &End);
    
    inline unsigned int Count() const {return TagCount;};
    inline void Get(const char *&Start,const char *&Stop,unsigned int I) const
diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 8e5d09e8a..589997081 100644
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -10,7 +10,7 @@ pkgVendorList::~pkgVendorList()
       delete *I;
 }
 
-// pkgVendorList::ReadMainList - Read list of known package vendors		/*{{{*/
+// pkgVendorList::ReadMainList - Read list of known package vendors	/*{{{*/
 // ---------------------------------------------------------------------
 /* This also scans a directory of vendor files similar to apt.conf.d 
    which can contain the usual suspects of distribution provided data.
@@ -31,8 +31,8 @@ bool pkgVendorList::ReadMainList()
 
    return CreateList(Cnf);
 }
-
-bool pkgVendorList::Read(string File)
+									/*}}}*/
+bool pkgVendorList::Read(string File)					/*{{{*/
 {
    Configuration Cnf;
    if (ReadConfigFile(Cnf,File,true) == false)
@@ -40,8 +40,8 @@ bool pkgVendorList::Read(string File)
 
    return CreateList(Cnf);
 }
-
-bool pkgVendorList::CreateList(Configuration& Cnf)
+									/*}}}*/
+bool pkgVendorList::CreateList(Configuration& Cnf)			/*{{{*/
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
 	I != VendorList.end(); I++)
@@ -110,8 +110,8 @@ bool pkgVendorList::CreateList(Configuration& Cnf)
    
    return !_error->PendingError();
 }
-
-const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)
+									/*}}}*/
+const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)	/*{{{*/
 {
    for (const_iterator I = VendorList.begin(); I != VendorList.end(); ++I)
    {
@@ -121,8 +121,8 @@ const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)
 
    return NULL;
 }
-
-const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)
+									/*}}}*/
+const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)	/*{{{*/
 {
    for (std::vector<string>::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); I++)
    {
@@ -142,3 +142,4 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)
 
    return NULL;
 }
+									/*}}}*/
diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 5c25c2f7b..b4d1d4696 100644
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -63,8 +63,8 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
 	 if (isdigit(Data[0]))
 	    RelVerStr = Data;
 	 else
-	    RelArchive = Data;
-	 
+	    RelRelease = Data;
+
 	 if (RelVerStr.length() > 0 && RelVerStr.end()[-1] == '*')
 	 {
 	    RelVerPrefixMatch = true;
@@ -87,19 +87,21 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
       {
 	 if (strlen(Fragments[J]) < 3)
 	    continue;
-	    
+
 	 if (stringcasecmp(Fragments[J],Fragments[J]+2,"v=") == 0)
 	    RelVerStr = Fragments[J]+2;
 	 else if (stringcasecmp(Fragments[J],Fragments[J]+2,"o=") == 0)
 	    RelOrigin = Fragments[J]+2;
 	 else if (stringcasecmp(Fragments[J],Fragments[J]+2,"a=") == 0)
 	    RelArchive = Fragments[J]+2;
+	 else if (stringcasecmp(Fragments[J],Fragments[J]+2,"n=") == 0)
+	    RelCodename = Fragments[J]+2;
 	 else if (stringcasecmp(Fragments[J],Fragments[J]+2,"l=") == 0)
 	    RelLabel = Fragments[J]+2;
 	 else if (stringcasecmp(Fragments[J],Fragments[J]+2,"c=") == 0)
 	    RelComponent = Fragments[J]+2;
       }
-      
+
       if (RelVerStr.end()[-1] == '*')
       {
 	 RelVerPrefixMatch = true;
@@ -169,15 +171,16 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
    {
       if (MatchAll == true)
 	 return true;
-      
+
 /*      cout << RelVerStr << ',' << RelOrigin << ',' << RelArchive << ',' << RelLabel << endl;
       cout << File.Version() << ',' << File.Origin() << ',' << File.Archive() << ',' << File.Label() << endl;*/
-      
+
       if (RelVerStr.empty() == true && RelOrigin.empty() == true &&
 	  RelArchive.empty() == true && RelLabel.empty() == true &&
+	  RelRelease.empty() == true && RelCodename.empty() == true &&
 	  RelComponent.empty() == true)
 	 return false;
-      
+
       if (RelVerStr.empty() == false)
 	 if (File->Version == 0 ||
 	     MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false)
@@ -187,11 +190,19 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
 	     stringcasecmp(RelOrigin,File.Origin()) != 0)
 	    return false;
       if (RelArchive.empty() == false)
-      {
-	 if (File->Archive == 0 || 
+	 if (File->Archive == 0 ||
 	     stringcasecmp(RelArchive,File.Archive()) != 0)
-	    return false;
-      }      
+            return false;
+      if (RelCodename.empty() == false)
+	 if (File->Codename == 0 ||
+	     stringcasecmp(RelCodename,File.Codename()) != 0)
+            return false;
+      if (RelRelease.empty() == false)
+	 if ((File->Archive == 0 ||
+	     stringcasecmp(RelRelease,File.Archive()) != 0) &&
+             (File->Codename == 0 ||
+	      stringcasecmp(RelRelease,File.Codename()) != 0))
+	       return false;
       if (RelLabel.empty() == false)
 	 if (File->Label == 0 ||
 	     stringcasecmp(RelLabel,File.Label()) != 0)
@@ -202,7 +213,7 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
 	    return false;
       return true;
    }
-   
+
    if (Type == Origin)
    {
       if (OrSite.empty() == false) {
@@ -213,7 +224,7 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
 	    return false;
       return (OrSite == File.Site());		/* both strings match */
    }
-   
+
    return false;
 }
 									/*}}}*/
diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index fe264aa46..a8f3c84ac 100644
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -3,29 +3,32 @@
 // $Id: versionmatch.h,v 1.4 2001/05/29 03:07:12 jgg Exp $
 /* ######################################################################
 
-   Version Matching 
-   
+   Version Matching
+
    This module takes a matching string and a type and locates the version
    record that satisfies the constraint described by the matching string.
 
      Version: 1.2*
      Release: o=Debian,v=2.1*,c=main
      Release: v=2.1*
+     Release: a=testing
+     Release: n=squeeze
      Release: *
      Origin: ftp.debian.org
-   
+
    Release may be a complex type that can specify matches for any of:
       Version (v= with prefix)
       Origin (o=)
-      Archive (a=)
+      Archive (a=) eg, unstable, testing, stable
+      Codename (n=) e.g. etch, lenny, squeeze, sid
       Label (l=)
       Component (c=)
    If there are no equals signs in the string then it is scanned in short
-   form - if it starts with a number it is Version otherwise it is an 
-   Archive.
-   
+   form - if it starts with a number it is Version otherwise it is an
+   Archive or a Codename.
+
    Release may be a '*' to match all releases.
-   
+
    ##################################################################### */
 									/*}}}*/
 #ifndef PKGLIB_VERSIONMATCH_H
@@ -47,6 +50,8 @@ class pkgVersionMatch
    string RelVerStr;
    bool RelVerPrefixMatch;
    string RelOrigin;
+   string RelRelease;
+   string RelCodename;
    string RelArchive;
    string RelLabel;
    string RelComponent;
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 425df6994..0e950310b 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -399,7 +399,7 @@ bool DumpAvail(CommandLine &Cmd)
    pkgCache &Cache = *GCache;
 
    pkgPolicy Plcy(&Cache);
-   if (ReadPinFile(Plcy) == false)
+   if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false)
       return false;
    
    unsigned long Count = Cache.HeaderP->PackageCount+1;
@@ -626,7 +626,7 @@ bool Depends(CommandLine &CmdL)
    
    return true;
 }
-
+									/*}}}*/
 // RDepends - Print out a reverse dependency tree - mbc			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -714,10 +714,7 @@ bool RDepends(CommandLine &CmdL)
    
    return true;
 }
-
 									/*}}}*/
-
-
 // xvcg - Generate a graph for xvcg					/*{{{*/
 // ---------------------------------------------------------------------
 // Code contributed from Junichi Uekawa <dancer@debian.org> on 20 June 2002.
@@ -937,8 +934,6 @@ bool XVcg(CommandLine &CmdL)
    return true;
 }
 									/*}}}*/
-
-
 // Dotty - Generate a graph for Dotty					/*{{{*/
 // ---------------------------------------------------------------------
 /* Dotty is the graphvis program for generating graphs. It is a fairly
@@ -1274,15 +1269,16 @@ bool DisplayRecord(pkgCache::VerIterator V)
    return true;
 }
 									/*}}}*/
-// Search - Perform a search						/*{{{*/
-// ---------------------------------------------------------------------
-/* This searches the package names and package descriptions for a pattern */
+
 struct ExDescFile
 {
    pkgCache::DescFile *Df;
    bool NameMatch;
 };
 
+// Search - Perform a search						/*{{{*/
+// ---------------------------------------------------------------------
+/* This searches the package names and package descriptions for a pattern */
 bool Search(CommandLine &CmdL)
 {
    pkgCache &Cache = *GCache;
@@ -1519,7 +1515,7 @@ bool Policy(CommandLine &CmdL)
    
    pkgCache &Cache = *GCache;
    pkgPolicy Plcy(&Cache);
-   if (ReadPinFile(Plcy) == false)
+   if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false)
       return false;
    
    // Print out all of the package files
@@ -1696,7 +1692,6 @@ bool Madison(CommandLine &CmdL)
 
    return true;
 }
-
 									/*}}}*/
 // GenCaches - Call the main cache generator				/*{{{*/
 // ---------------------------------------------------------------------
@@ -1770,8 +1765,7 @@ void CacheInitialize()
    _config->Set("help",false);
 }
 									/*}}}*/
-
-int main(int argc,const char *argv[])
+int main(int argc,const char *argv[])					/*{{{*/
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
@@ -1878,3 +1872,4 @@ int main(int argc,const char *argv[])
           
    return 0;
 }
+									/*}}}*/
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 379a433ea..342b6314a 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -40,8 +40,7 @@
 
 using namespace std;
 
-                                                                        /*{{{*/
-class pkgCdromTextStatus : public pkgCdromStatus
+class pkgCdromTextStatus : public pkgCdromStatus			/*{{{*/
 {
 protected:
    OpTextProgress Progress;
@@ -98,9 +97,7 @@ OpProgress* pkgCdromTextStatus::GetOpProgress()
 { 
    return &Progress; 
 };
-
 									/*}}}*/
-
 // DoAdd - Add a new CDROM						/*{{{*/
 // ---------------------------------------------------------------------
 /* This does the main add bit.. We show some status and things. The
@@ -129,7 +126,6 @@ bool DoIdent(CommandLine &)
    return cdrom.Ident(ident, &log);
 }
 									/*}}}*/
-
 // ShowHelp - Show the help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -164,8 +160,7 @@ int ShowHelp()
    return 0;
 }
 									/*}}}*/
-
-int main(int argc,const char *argv[])
+int main(int argc,const char *argv[])					/*{{{*/
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
@@ -222,3 +217,4 @@ int main(int argc,const char *argv[])
    
    return 0;
 }
+									/*}}}*/
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 63fa0867c..9919a9c94 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -88,8 +88,7 @@ int ShowHelp()
    return 0;
 }
 									/*}}}*/
-
-int main(int argc,const char *argv[])
+int main(int argc,const char *argv[])					/*{{{*/
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
@@ -133,3 +132,4 @@ int main(int argc,const char *argv[])
    
    return 0;
 }
+									/*}}}*/
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index de22386b9..21ef1a050 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -348,8 +348,7 @@ bool Go(CommandLine &CmdL)
 	return !_error->PendingError();
 }
 									/*}}}*/
-
-int main(int argc, const char **argv)
+int main(int argc, const char **argv)					/*{{{*/
 {
 	CommandLine::Args Args[] = {
 		{'h',"help","help",0},
@@ -391,3 +390,4 @@ int main(int argc, const char **argv)
 	
 	return 0;
 }
+									/*}}}*/
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 2693bd968..ab6dca388 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -111,6 +111,9 @@ class CacheFile : public pkgCacheFile
 	 return Open(true);
    }
    CacheFile() : List(0) {};
+   ~CacheFile() {
+      delete[] List;
+   }
 };
 									/*}}}*/
 
@@ -594,7 +597,6 @@ void Stats(ostream &out,pkgDepCache &Dep)
 	       Dep.BadCount());
 }
 									/*}}}*/
-
 // CacheFile::NameComp - QSort compare by name				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -687,7 +689,10 @@ bool CacheFile::CheckDeps(bool AllowBroken)
       
    return true;
 }
-
+									/*}}}*/
+// CheckAuth - check if each download comes form a trusted source	/*{{{*/
+// ---------------------------------------------------------------------
+/* */
 static bool CheckAuth(pkgAcquire& Fetcher)
 {
    string UntrustedList;
@@ -728,10 +733,7 @@ static bool CheckAuth(pkgAcquire& Fetcher)
 
    return _error->Error(_("There are problems and -y was used without --force-yes"));
 }
-
-
 									/*}}}*/
-
 // InstallPackages - Actually download and install the packages		/*{{{*/
 // ---------------------------------------------------------------------
 /* This displays the informative messages describing what is going to 
@@ -1301,9 +1303,9 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
    while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0)
    {
       string Ver = Parse->Version();
-      
+
       // show name mismatches
-      if (IsMatch == true && Parse->Package() != Src) 
+      if (IsMatch == true && Parse->Package() != Src)       
 	 ioprintf(c1out,  _("No source package '%s' picking '%s' instead\n"), Parse->Package().c_str(), Src.c_str());
       
       if (VerTag.empty() == false)
@@ -1335,7 +1337,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
    return Last;
 }
 									/*}}}*/
-
 // DoUpdate - Update the package lists					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -1457,7 +1458,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
    }
    return true;
 }
-
+									/*}}}*/
 // DoUpgrade - Upgrade all packages					/*{{{*/
 // ---------------------------------------------------------------------
 /* Upgrade all packages without installing new packages or erasing old
@@ -1532,7 +1533,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix,
    regfree(&Pattern);
    return res;
 }
-
+									/*}}}*/
 // DoInstall - Install packages from the command line			/*{{{*/
 // ---------------------------------------------------------------------
 /* Install named packages */
@@ -1870,7 +1871,8 @@ bool DoInstall(CommandLine &CmdL)
    // cache.commit()
    if (AutoMarkChanged > 0 &&
        Cache->DelCount() == 0 && Cache->InstCount() == 0 &&
-       Cache->BadCount() == 0)
+       Cache->BadCount() == 0 &&
+       _config->FindB("APT::Get::Simulate",false) == false)
       Cache->writeStateFile(NULL);
 
    // See if we need to prompt
@@ -2522,7 +2524,7 @@ bool DoBuildDep(CommandLine &CmdL)
             {
                // We successfully installed something; skip remaining alternatives
                skipAlternatives = hasAlternatives;
-	       if(_config->FindB("APT::Get::Build-Dep-Automatic", true) == true)
+	       if(_config->FindB("APT::Get::Build-Dep-Automatic", false) == true)
 		  Cache->MarkAuto(Pkg, true);
                continue;
             }
@@ -2698,8 +2700,7 @@ void SigWinch(int)
 #endif
 }
 									/*}}}*/
-
-int main(int argc,const char *argv[])
+int main(int argc,const char *argv[])					/*{{{*/
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
@@ -2739,7 +2740,6 @@ int main(int argc,const char *argv[])
       {0,"only-source","APT::Get::Only-Source",0},
       {0,"arch-only","APT::Get::Arch-Only",0},
       {0,"auto-remove","APT::Get::AutomaticRemove",0},
-      {0,"build-dep-automatic","APT::Get::Build-Dep-Automatic",0},
       {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0},
       {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
       {0,"fix-policy","APT::Get::Fix-Policy-Broken",0},
@@ -2789,7 +2789,19 @@ int main(int argc,const char *argv[])
       ShowHelp(CmdL);
       return 0;
    }
-   
+
+   // simulate user-friendly if apt-get has no root privileges
+   if (getuid() != 0 && _config->FindB("APT::Get::Simulate") == true)
+   {
+      if (_config->FindB("APT::Get::Show-User-Simulation-Note",true) == true)
+	 cout << _("NOTE: This is only a simulation!\n"
+	    "      apt-get needs root privileges for real execution.\n"
+	    "      Keep also in mind that locking is deactivated,\n"
+	    "      so don't depend on the relevance to the real current situation!"
+	 ) << std::endl;
+      _config->Set("Debug::NoLocking",true);
+   }
+
    // Deal with stdout not being a tty
    if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
       _config->Set("quiet","1");
@@ -2821,3 +2833,4 @@ int main(int argc,const char *argv[])
    
    return 0;   
 }
+									/*}}}*/
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 7b2a74aed..171b0ba13 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -31,7 +31,7 @@
 
 using namespace std;
 
-struct PkgName
+struct PkgName								/*{{{*/
 {
    string Name;
    string Ver;
@@ -55,7 +55,7 @@ struct PkgName
    bool operator >(const PkgName &x) const {return Compare3(x) > 0;};
    bool operator ==(const PkgName &x) const {return Compare3(x) == 0;};
 };
-
+									/*}}}*/
 // DoIt - Sort a single file						/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -161,8 +161,7 @@ int ShowHelp()
    return 0;
 }
 									/*}}}*/
-
-int main(int argc,const char *argv[])
+int main(int argc,const char *argv[])					/*{{{*/
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
@@ -206,3 +205,4 @@ int main(int argc,const char *argv[])
    
    return 0;   
 }
+									/*}}}*/
diff --git a/configure.in b/configure.in
index f90a32c3b..48b1def5c 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.20~exp3")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.21")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
diff --git a/debian/.cvsignore b/debian/.cvsignore
deleted file mode 100644
index d9f983686..000000000
--- a/debian/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-copyright
-apt
-apt-doc
-apt-utils
-apt-utils.substvars
-apt.substvars
-files
-libapt-pkg-dev
-libapt-pkg-doc
-shlibs.local
-shlibs.local.apt
-shlibs.local.apt-utils
-*.debhelper
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index cc81a3a69..4f47ccfab 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -69,7 +69,7 @@ check_stamp()
     interval="$2"
 
     if [ $interval -eq 0 ]; then
-	debug_echo "check_stamp: interval=0."
+	debug_echo "check_stamp: interval=0"
 	# treat as no time has passed
         return 1
     fi
@@ -81,13 +81,38 @@ check_stamp()
     fi
 
     # compare midnight today to midnight the day the stamp was updated
-    stamp=$(date -r $stamp '+%s')
+    stamp_file="$stamp"
+    stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null)
+    if [ "$?" != "0" ]; then
+        # Due to some timezones returning 'invalid date' for midnight on
+        # certain dates (eg America/Sao_Paulo), if date returns with error
+        # remove the stamp file and return 0. See coreutils bug:
+        # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html
+        rm -f "$stamp_file"
+        return 0
+    fi
+
+    now=$(date --date=$(date --iso-8601) +%s 2>/dev/null)
+    if [ "$?" != "0" ]; then
+        # As above, due to some timezones returning 'invalid date' for midnight
+        # on certain dates (eg America/Sao_Paulo), if date returns with error
+        # return 0.
+        return 0
+    fi
+
     delta=$(($now-$stamp))
 
     # intervall is in days, convert to sec.
     interval=$(($interval*60*60*24))
     debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)"
 
+    # remove timestamps a day (or more) in the future and force re-check
+    if [ $stamp -gt $(($now+86400)) ]; then
+         echo "WARNING: file $stamp_file has a timestamp in the future: $stamp"
+         rm -f "$stamp_file"
+         return 0
+    fi
+
     if [ $delta -ge $interval ]; then
         return 0
     fi
diff --git a/debian/apt.dirs b/debian/apt.dirs
index 47f60e7e3..fb6716c35 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -3,6 +3,7 @@ usr/lib/apt/methods
 usr/lib/dpkg/methods/apt
 etc/apt
 etc/apt/apt.conf.d
+etc/apt/preferences.d
 etc/apt/sources.list.d
 etc/logrotate.d
 var/cache/apt/archives/partial
diff --git a/debian/changelog b/debian/changelog
index 59a88ca21..d39bf3d2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.7.22) unstable; urgency=low
+apt (0.7.23) unstable; urgency=low
 
   * cmdline/apt-get.cc:
     - honor APT::Get::Only-Source properly in FindSrc() (thanks to
@@ -6,16 +6,55 @@ apt (0.7.22) unstable; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jul 2009 15:27:30 +0200
 
-apt (0.7.21) UNRELEASED; urgency=low
+apt (0.7.22) unstable; urgency=low
 
-  [ Osamu Aoki ]
-  * Updated cron script to support backups by hardlinks and 
-    verbose levels.  All features turned off by default. 
-  * Added more error handlings.  Closes: #438803, #462734, #454989, 
-  * Documented all cron script related configuration items in 
-    configure-index.
+  [ Christian Perrier ]
+  * Documentation translations:
+    - Fix a typo in apt-get(8) French translation. Closes: #525043
+      Thanks to Guillaume Delacour for spotting it.
+    - Updated apt.conf(5) manpgae French translation.
+      Thanks to Aurélien Couderc.
+  * Translations:
+    - fr.po
+    - sk.po. Closes: #525857 
+    - ru.po. Closes: #526816
+    - eu.po. Closes: #528985
+    - zh_CN.po. Closes: #531390
+    - fr.po
+    - it.po. Closes: #531758
+    - ca.po. Closes: #531921
+    - de.po. Closes: #536430
+  * Added translations
+    - ast.po (Asturian by Marcos Alvareez Costales).
+      Closes: #529007, #529730, #535328
+  
+  [ David Kalnischkies ]
+  * [ABI break] support '#' in apt.conf and /etc/apt/preferences
+    (closes: #189866)
+  * [ABI break] Allow pinning by codename (closes: #97564)
+  * support running "--simulate" as user
+  * add depth information to the debug output and show what depends
+    type triggers a autoinst (closes: #458389)
+  * add Debug::pkgDepCache::Marker with more detailed debug output 
+    (closes: #87520)
+  * add Debug::pkgProblemResolver::ShowScores and make the scores
+    adjustable
+  * do not write state file in simulate mode (closes: #433007)
+  * add hook for MarkInstall and MarkDelete (closes: #470035)
+  * fix typo in apt-pkg/acquire.cc which prevents Dl-Limit to work
+    correctly when downloading from multiple sites (Closes: #534752)
+  * add the various foldmarkers in apt-pkg & cmdline (no code change)
+  * versions with a pin of -1 shouldn't be a candidate (Closes: #355237)
+  * prefer mmap as memory allocator in MMap instead of a static char
+    array which can (at least in theory) grow dynamic
+  * eliminate (hopefully all) segfaults in pkgcachegen.cc and mmap.cc
+    which can arise if cache doesn't fit into the mmap (Closes: #535218)
+  * display warnings instead of errors if the parts dirs doesn't exist
 
   [ Michael Vogt ]
+  * honor the dpkg hold state in new Marker hooks (closes: #64141)
+  * debian/apt.cron.daily:
+    - if the timestamp is too far in the future, delete it
   * apt-pkg/acquire.cc:
     - make the max pipeline depth of the acquire queue configurable
       via Acquire::Max-Pipeline-Depth
@@ -23,6 +62,8 @@ apt (0.7.21) UNRELEASED; urgency=low
     - add Dpkg::UseIoNice boolean option to run dpkg with ionice -c3
       (off by default)
     - send "dpkg-exec" message on the status fd when dpkg is run
+    - provide DPkg::Chroot-Directory config option (useful for testing)
+    - fix potential hang when in a backgroud process group
   * apt-pkg/algorithms.cc:
     - consider recommends when making the scores for the problem 
       resolver
@@ -33,8 +74,6 @@ apt (0.7.21) UNRELEASED; urgency=low
   * methods/http.cc:
     - ignore SIGPIPE, we deal with EPIPE from write in 
       HttpMethod::ServerDie() (LP: #385144)
-  * apt-pkg/deb/dpkgpm.cc:
-    - provide DPkg::Chroot-Directory config option (useful for testing)
   * Only run Download-Upgradable and Unattended-Upgrades if the initial
     update was successful Closes: #341970
   * apt-pkg/indexcopy.cc:
@@ -43,60 +82,126 @@ apt (0.7.21) UNRELEASED; urgency=low
      (LP: #255545)
     - remove the gettext from a string that consists entirely 
       of variables (LP: #56792)
-  * doc/makefile:
-    - add examples/apt-https-method-example.conf
   * apt-pkg/cacheiterators.h:
     - add missing checks for Owner == 0 in end()
-  * apt-pkg/deb/dpkgpm.cc:
-    - fix potential hang when in a backgroud process group
   * apt-pkg/indexrecords.cc:
     - fix some i18n issues
   * apt-pkg/contrib/strutl.h:
     - add new strprintf() function to make i18n strings easier
-  * methods/gpgv.cc:
     - fix compiler warning
-  * cmdline/apt-get.cc:
-    - fix "apt-get source pkg=ver" if binary name != source name
-      and show a message (LP: #202219)
-    - fix "apt-get source pkg" if there is a binary package and
-      a source package of the same name but from different 
-      packages (LP: #330103)
   * apt-pkg/deb/debsystem.cc:
     - make strings i18n able 
-  * apt-pkg/contrib/strutl.cc:
-    - fix TimeToStr i18n (LP: #289807)
-  * [ABI break] merge support for http redirects, thanks to
-    Jeff Licquia and Anthony Towns
-  * [ABI break] use int for the package IDs (thanks to Steve Cotton)
-  * apt-pkg/pkgcache.cc:
-    - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
-      state (LP: #322955)
-  * methods/https.cc:
-    - add Acquire::https::AllowRedirect support
-  * methods/gpgv.cc:
-    - properly check for expired and revoked keys (closes: #433091)
   * fix problematic use of tolower() when calculating the version 
     hash by using locale independant tolower_ascii() function. 
     Thanks to M. Vefa Bicakci (LP: #80248)
   * build fixes for g++-4.4
   * cmdline/apt-mark:
     - add "showauto" option to show automatically installed packages
+  * document --install-recommends and --no-install-recommends
+    (thanks to Dereck Wonnacott, LP: #126180)
   * doc/apt.conf.5.xml:
     - merged patch from Aurélien Couderc to improve the text
       (thanks!)
+  * [ABI] merged the libudev-dlopen branch, this allows to pass
+    "apt-udev-auto" to Acquire::Cdrom::mount and the cdrom method will  
+    dynamically find/mount the cdrom device (if libhal is available)
+
+  [ Julian Andres Klode ]
+  * apt-pkg/contrib/configuration.cc: Fix a small memory leak in
+    ReadConfigFile.
+  * Introduce support for the Enhances field. (Closes: #137583) 
+  * Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512)
+  * configure-index: document Dir::Etc::SourceParts and some other options
+    (Closes: #459605)
+  * Remove Eugene V. Lyubimkin from uploaders as requested.
+  * apt-pkg/contrib/hashes.cc, apt-pkg/contrib/md5.cc:
+    - Support reading until EOF if Size=0 to match behaviour of
+      SHA1Summation and SHA256Summation
+
+  [ Osamu Aoki ]
+  * Updated cron script to support backups by hardlinks and 
+    verbose levels.  All features turned off by default. 
+  * Added more error handlings.  Closes: #438803, #462734, #454989, 
+  * Documented all cron script related configuration items in 
+    configure-index.
 
   [ Dereck Wonnacott ]
   * apt-ftparchive might write corrupt Release files (LP: #46439)
   * Apply --important option to apt-cache depends (LP: #16947) 
-  * Clarify the --help for 'purge' (LP: #243948)
 
+  [ Otavio Salvador ]
+  * Apply patch from Sami Liedes <sliedes@cc.hut.fi> to reduce the
+    number of times we call progress bar updating and debugging
+    configuration settings.
+  * Apply patch from Sami Liedes <sliedes@cc.hut.fi> to avoid unecessary
+    temporary allocations.
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 29 Jul 2009 19:16:22 +0200
+
+apt (0.7.21) unstable; urgency=low
+
+  [ Christian Perrier ]
+  * Translations:
+    - bg.po. Closes: #513211
+    - zh_TW.po. Closes: #513311
+    - nb.po. Closes: #513843
+    - fr.po. Closes: #520430
+    - sv.po. Closes: #518070
+    - sk.po. Closes: #520403
+    - it.po. Closes: #522222
+    - sk.po. Closes: #520403
+  
+  [ Jamie Strandboge ]
+  * apt.cron.daily: catch invalid dates due to DST time changes
+    in the stamp files
+
+  [ Michael Vogt ]
+  * methods/gpgv.cc:
+    - properly check for expired and revoked keys (closes: #433091)
+  * apt-pkg/contrib/strutl.cc:
+    - fix TimeToStr i18n (LP: #289807)
+  * [ABI break] merge support for http redirects, thanks to
+    Jeff Licquia and Anthony Towns
+  * [ABI break] use int for the package IDs (thanks to Steve Cotton)
+  * apt-pkg/pkgcache.cc:
+    - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
+      state (LP: #322955)
+  * methods/https.cc:
+    - add Acquire::https::AllowRedirect support
+  * Clarify the --help for 'purge' (LP: #243948)
+  * cmdline/apt-get.cc
+    - fix "apt-get source pkg" if there is a binary package and
+      a source package of the same name but from different 
+      packages (LP: #330103)
 
   [ Colin Watson ]
   * cmdline/acqprogress.cc:
     - Call pkgAcquireStatus::Pulse even if quiet, so that we still get
       dlstatus messages on the status-fd (LP: #290234).
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 12 Sep 2008 11:34:24 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 14 Apr 2009 14:12:51 +0200
+
+apt (0.7.20.2) unstable; urgency=medium
+
+  [ Eugene V. Lyubimkin ]
+  * Urgency set to medium due to RC bug fix.
+  * doc/apt.ent, apt-get.8.xml:
+    - Fix invalid XML entities. (Closes: #514402)
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 07 Feb 2009 16:48:21 +0200
+
+apt (0.7.20.1) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * apt-pkg/pkgcachegen.cc:
+    - fix apt-cache search for localized description 
+      (closes: #512110)
+  
+  [ Christian Perrier ]
+  * Translations:
+    - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul.
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 20 Jan 2009 09:35:05 +0100
 
 apt (0.7.20) unstable; urgency=low
 
@@ -112,35 +217,37 @@ apt (0.7.20) unstable; urgency=low
       (Closes: #457265)
     - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
       (Closes: #438559)
-
-  [ Michael Vogt ]
-  * apt-pkg/depcache.cc:
-    - when checking for new important deps, skip critical ones
-      (LP: #236360)
-  * document --install-recommends and --no-install-recommends
-    (thanks to Dereck Wonnacott, LP: #126180)
-  * make "apt-get build-dep" installed packages marked automatic
-    by default. This can be changed by setting the value of
-    APT::Get::Build-Dep-Automatic to false (thanks to Aaron 
-    Haviland, closes: #44874, LP: #248268)
-
- -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 06 Dec 2008 20:57:00 +0200
-
-apt (0.7.20~exp2) unstable; urgency=low
-
-  [ Eugene V. Lyubimkin ]
+    - Mentioned '/* ... */' comments. (Closes: #507601)
   * doc/examples/sources.list:
     - Removed obsolete commented non-us deb-src entry, replaced it with
       'deb-src security.debian.org' one. (Closes: #411298)
   * apt-pkg/contrib/mmap.cc:
     - Added instruction how to work around MMap error in MMap error message.
       (Closes: #385674, 436028)
+  * COPYING:
+    - Actualized. Removed obsolete Qt section, added GPLv2 clause.
+      (Closes: #440049, #509337)
+
+  [ Michael Vogt ]
+  * add option to "apt-get build-dep" to mark the needed 
+    build-dep packages as automatic installed. 
+    This is controlled via the value of
+    APT::Get::Build-Dep-Automatic and is set "false" by default.  
+    Thanks to Aaron Haviland, closes: #448743
+  * apt-inst/contrib/arfile.cc:
+    - support members ending with '/' as well (thanks to Michal Cihr,
+      closes: #500988)
 
   [ Christian Perrier ]
   * Translations:
+    - Finnish updated. Closes: #508449 
+    - Galician updated. Closes: #509151
+    - Catalan updated. Closes: #509375
+    - Vietnamese updated. Closes: #509422
+    - Traditional Chinese added. Closes: #510664
     - French corrected (remove awful use of first person) 
 
- -- Michael Vogt <mvo@debian.org>  Tue, 02 Dec 2008 20:30:14 +0100
+ -- Michael Vogt <mvo@debian.org>  Mon, 05 Jan 2009 08:59:20 +0100
 
 apt (0.7.19) unstable; urgency=low
 
@@ -158,7 +265,6 @@ apt (0.7.19) unstable; urgency=low
       is a request to install only one package and it is not installable.
       (Closes: #419521)
 
-
   [ Michael Vogt ]
     - fix SIGHUP handling (closes: #463030)
 
diff --git a/debian/control b/debian/control
index ba9e32e4b..84c411509 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
  Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
- Luca Bruno <lethalman88@gmail.com>, Eugene V. Lyubimkin <jackyf.devel@gmail.com>
-Standards-Version: 3.8.0
+ Luca Bruno <lethalman88@gmail.com>
+Standards-Version: 3.8.1.0
 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto
 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 
diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644
index 94d80ad54..000000000
--- a/doc/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-apt-cache.8
-apt-get.8
-apt-cdrom.8
-apt.conf.5
-sources.list.5
-apt-config.8
-apt-sortpkgs.1
-apt-ftparchive.1
-manpage.links
-manpage.refs
-manpage.log
-apt_preferences.5
-apt-extracttemplates.1
-vendors.list.5
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 64c3a35e4..920f6b36e 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -53,6 +53,9 @@
 			  <arg choice='plain'>
 				  <replaceable>target_release_number_expression</replaceable>
 			  </arg>
+			  <arg choice='plain'>
+				  <replaceable>target_release_codename</replaceable>
+			  </arg>
 		  </group>
       </arg>
 
@@ -71,6 +74,9 @@
 						<arg choice='plain'>
 							/<replaceable>target_release_name</replaceable>
 						</arg>
+						<arg choice='plain'>
+							/<replaceable>target_release_codename</replaceable>
+						</arg>
 					</group>
 				</arg>
 			 </arg>
@@ -357,6 +363,12 @@
      actually change the system. 
      Configuration Item: <literal>APT::Get::Simulate</literal>.</para>
 
+     <para>Simulation run as user will deactivate locking (<literal>Debug::NoLocking</literal>)
+     automatical. Also a notice will be displayed indicating that this is only a simulation,
+     if the option <literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: true)
+     Neigther NoLocking nor the notice will be triggered if run as root (root should know what
+     he is doing without further warnings by <literal>apt-get</literal>).</para>
+
      <para>Simulate prints out
      a series of lines each one representing a dpkg operation, Configure (Conf),
      Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
@@ -463,7 +475,8 @@
      of this option. In short, this option
      lets you have simple control over which distribution packages will be
      retrieved from. Some common examples might be 
-     <option>-t '2.1*'</option> or <option>-t unstable</option>.
+     <option>-t '2.1*'</option>, <option>-t unstable</option>
+     or <option>-t sid</option>.
      Configuration Item: <literal>APT::Default-Release</literal>;
      see also the &apt-preferences; manual page.</para></listitem>
      </varlistentry>
@@ -589,8 +602,8 @@
 	 <title>CURRENT AUTHORS</title>
 	 <para>
 		 &apt-author.team;
-		 &apt-qapage;
 	 </para>
+		 &apt-qapage;
  </refsect1>
  &manbugs;
 </refentry>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 6590c9795..2b2430c83 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -21,7 +21,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>06 December 2008</date>
+   <date>10 December 2008</date>
  </refentryinfo>
  
  <refmeta>
@@ -53,8 +53,9 @@
    parent groups.</para> 
 
    <para>Syntactically the configuration language is modeled after what the ISC tools
-   such as bind and dhcp use.  Lines starting with
-   <literal>//</literal> are treated as comments (ignored).
+   such as bind and dhcp use. Lines starting with
+   <literal>//</literal> are treated as comments (ignored), as well as all text
+   between <literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments.
    Each line is of the form
    <literal>APT::Get::Assume-Yes "true";</literal> The trailing 
    semicolon is required and the quotes are optional. A new scope can be
@@ -110,7 +111,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      
      <varlistentry><term>Default-Release</term>
 	 <listitem><para>Default release to install packages from if more than one
-	 version available. Contains release name or release version. Examples: 'stable', 'testing', 'unstable', '4.0', '5.0*'. Release codenames ('etch', 'lenny' etc.) are not allowed now. See also &apt-preferences;.</para></listitem>
+	 version available. Contains release name, codename or release version. Examples: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-preferences;.</para></listitem>
      </varlistentry>
      
      <varlistentry><term>Ignore-Hold</term>
@@ -679,6 +680,27 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
        </listitem>
      </varlistentry>
 
+     <varlistentry>
+       <term><literal>Debug::pkgDepCache::Marker</literal></term>
+       <listitem>
+        <para>
+           Generate debug messages describing which package is marked
+          as keep/install/remove while the ProblemResolver does his work.
+          Each addition or deletion may trigger additional actions;
+          they are shown indented two additional space under the original entry.
+          The format for each line is <literal>MarkKeep</literal>,
+          <literal>MarkDelete</literal> or <literal>MarkInstall</literal> followed by
+          <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)</literal>
+          where <literal>a.b.c</literal> is the current version of the package,
+          <literal>d.e.f</literal> is the version considered for installation and
+          <literal>x.y.z</literal> is a newer version, but not considered for installation
+          (because of a low pin score). The later two can be omitted if there is none or if
+          it is the same version as the installed.
+          <literal>section</literal> is the name of the section the package appears in.
+        </para>
+       </listitem>
+     </varlistentry>
+
      <!-- Question: why doesn't this do anything?  The code says it should. -->
      <varlistentry>
        <term><literal>Debug::pkgInitConfig</literal></term>
@@ -757,6 +779,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry>
+       <term><literal>Debug::pkgProblemResolver::ShowScores</literal></term>
+       <listitem>
+        <para>
+          Display a list of all installed packages with their calculated score
+          used by the pkgProblemResolver. The description of the package
+          is the same as described in <literal>Debug::pkgDepCache::Marker</literal>
+        </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
        <term><literal>Debug::sourceList</literal></term>
 
        <listitem>
diff --git a/doc/apt.ent b/doc/apt.ent
index 6594ba1b3..4cfc00069 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -179,6 +179,13 @@
    </author>
 ">
 
+<!ENTITY apt-author.moconnor "
+   <author>
+    <firstname>Mike</firstname>
+    <surname>O'Connor</surname>
+   </author>
+">
+
 <!ENTITY apt-author.team "
    <author>
     <othername>APT team</othername>
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 162c2f00e..ff63f1dd3 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>29 February 2004</date>
+   <date>04 May 2009</date>
  </refentryinfo>
 
  <refmeta>
@@ -191,6 +191,15 @@ Pin-Priority: 50
 </programlisting>
 
 <simpara>The following record assigns a high priority to all package versions
+belonging to any distribution whose Codename is "<literal>squeeze</literal>".</simpara>
+
+<programlisting>
+Package: *
+Pin: release n=squeeze
+Pin-Priority: 900
+</programlisting>
+
+<simpara>The following record assigns a high priority to all package versions
 belonging to any release whose Archive name is "<literal>stable</literal>"
 and whose release Version number is "<literal>3.0</literal>".</simpara>
 
@@ -327,10 +336,11 @@ file are relevant for setting APT priorities:
 
 <variablelist>
 <varlistentry>
-<term>the <literal>Archive:</literal> line</term>
+<term>the <literal>Archive:</literal> or <literal>Suite:</literal> line</term>
 <listitem><simpara>names the archive to which all the packages
 in the directory tree belong.  For example, the line
-"Archive: stable"
+"Archive: stable" or
+"Suite: stable"
 specifies that all of the packages in the directory
 tree below the parent of the <filename>Release</filename> file are in a
 <literal>stable</literal> archive.  Specifying this value in the APT preferences file
@@ -343,6 +353,22 @@ Pin: release a=stable
 </varlistentry>
 
 <varlistentry>
+<term>the <literal>Codename:</literal> line</term>
+<listitem><simpara>names the codename to which all the packages
+in the directory tree belong.  For example, the line
+"Codename: squeeze"
+specifies that all of the packages in the directory
+tree below the parent of the <filename>Release</filename> file belong to a version named
+<literal>squeeze</literal>.  Specifying this value in the APT preferences file
+would require the line:
+</simpara>
+<programlisting>
+Pin: release n=squeeze
+</programlisting>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term>the <literal>Version:</literal> line</term>
 <listitem><simpara>names the release version.  For example, the
 packages in the tree might belong to Debian GNU/Linux release
@@ -522,7 +548,64 @@ version.
 apt-get install <replaceable>package</replaceable>/unstable
 </programlisting>
 </para>
+</refsect2>
+
+
+<refsect2>
+<title>Tracking the evolution of a codename release</title>
+
+<para>The following APT preferences file will cause APT to assign a
+priority higher than the default (500) to all package versions belonging
+to a specified codename of a distribution and a prohibitively low priority to
+package versions belonging to other <literal>Debian</literal> distributions,
+codenames and archives.
+Note that with this APT preference APT will follow the migration of a release
+from the archive <literal>testing</literal> to <literal>stable</literal> and
+later <literal>oldstable</literal>. If you want to follow for example the progress
+in <literal>testing</literal> notwithstanding the codename changes you should use
+the example configurations above.
+
+<programlisting>
+Explanation: Uninstall or do not install any Debian-originated package versions
+Explanation: other than those in the distribution codenamed with squeeze or sid
+Package: *
+Pin: release n=squeeze
+Pin-Priority: 900
+
+Explanation: Debian unstable is always codenamed with sid
+Package: *
+Pin: release a=sid
+Pin-Priority: 800
+
+Package: *
+Pin: release o=Debian
+Pin-Priority: -10
+</programlisting>
+</para>
+
+<para>With a suitable &sources-list; file and the above preferences file,
+any of the following commands will cause APT to upgrade to the
+latest version(s) in the release codenamed with <literal>squeeze</literal>.
+
+<programlisting>
+apt-get install <replaceable>package-name</replaceable>
+apt-get upgrade
+apt-get dist-upgrade
+</programlisting>
+</para>
+
+<para>The following command will cause APT to upgrade the specified
+package to the latest version from the <literal>sid</literal> distribution.
+Thereafter, <command>apt-get upgrade</command> will upgrade
+the package to the most recent <literal>squeeze</literal> version if that is
+more recent than the installed version, otherwise, to the most recent
+<literal>sid</literal> version if that is more recent than the installed
+version.
 
+<programlisting>
+apt-get install <replaceable>package</replaceable>/sid
+</programlisting>
+</para>
 </refsect2>
 </refsect1>
 
@@ -535,4 +618,3 @@ apt-get install <replaceable>package</replaceable>/unstable
  &manbugs;
 
 </refentry>
-
diff --git a/doc/es/.cvsignore b/doc/es/.cvsignore
deleted file mode 100644
index ce363466a..000000000
--- a/doc/es/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-apt-cache.es.8
-apt-get.es.8
-apt-cdrom.es.8
-apt.conf.es.5
-sources.list.es.5
-apt-config.es.8
-apt-sortpkgs.es.1
-apt-ftparchive.es.1
-manpage.links
-manpage.refs
-manpage.log
-apt_preferences.es.5
-apt-extracttemplates.es.1
-vendors.list.es.5
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index a4167085b..5dc7b5246 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -55,6 +55,7 @@ APT
      Diff-Only "false";
      Tar-Only "false";
      Build-Dep-Automatic "true";
+     Show-User-Simulation-Note "true";
   };
 
   Cache 
@@ -271,10 +272,14 @@ Dir "/"
   
   // Config files
   Etc "etc/apt/" {
-     SourceList "sources.list";
      Main "apt.conf";
-     Preferences "preferences";     
      Parts "apt.conf.d/";
+     Preferences "preferences";
+     PreferencesParts "preferences.d";
+     SourceList "sources.list";
+     SourceParts "sources.list.d";
+     VendorList "vendors.list";
+     VendorParts "vendors.list.d";
   };
   
   // Locations of binaries
@@ -340,7 +345,9 @@ DPkg
 Debug 
 {
   pkgProblemResolver "false";
+  pkgProblemResolver::ShowScores "false";
   pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
+  pkgDepCache::Marker "false"; 
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgAcquire::Auth "false";
diff --git a/doc/fr/.cvsignore b/doc/fr/.cvsignore
deleted file mode 100644
index cfa89623e..000000000
--- a/doc/fr/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-apt-cdrom.fr.8
-apt-config.fr.8
-apt-extracttemplates.fr.1
-apt-ftparchive.fr.1
-apt-sortpkgs.fr.1
-apt.conf.fr.5
-apt_preferences.fr.5
-manpage.links
-manpage.refs
-sources.list.fr.5
-apt-cache.fr.8
-apt-get.fr.8
-vendors.list.fr.5
diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml
index dccf415b1..c1b8552cb 100644
--- a/doc/fr/apt-get.fr.8.xml
+++ b/doc/fr/apt-get.fr.8.xml
@@ -201,7 +201,7 @@ semblables � des sources t�l�charg�s sous forme de tarball.
 <listitem><para>   
 Avec la commande <literal>build-dep</literal>, apt-get installe ou supprime des paquets
 dans le but de satisfaire les d�pendances de construction d'un paquet source.
-Pour l'instant, dans la cas d'un paquet virtuel, un paquet est choisi au
+Pour l'instant, dans le cas d'un paquet virtuel, un paquet est choisi au
 hasard.
      </para></listitem>
 </varlistentry>
diff --git a/doc/fr/apt.conf.fr.5.xml b/doc/fr/apt.conf.fr.5.xml
index 88ce46134..f4d8eddb8 100644
--- a/doc/fr/apt.conf.fr.5.xml
+++ b/doc/fr/apt.conf.fr.5.xml
@@ -15,7 +15,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>29 F�vrier 2004</date>
+   <date>11 juillet 2008</date>
  </refentryinfo>
 
 <refmeta>
@@ -33,26 +33,30 @@ Le fichier <filename>apt.conf</filename> est le principal fichier de configurati
 de la collection d'outils que constitue APT&nbsp;; tous les outils font appel � ce 
 fichier de configuration et utilisent un analyseur syntaxique en ligne de 
 commande commun afin de fournir un environnement uniforme. Quand un outil
-d'APT d�marre, il lit (si elle existe) la variable d'environnement 
-<envar>APT_CONFIG</envar>&nbsp;; puis il lit les fichiers situ�s dans 
+d'APT d�marre, il lit la configuration d�sign�e par variable d'environnement 
+<envar>APT_CONFIG</envar> (si elle existe), puis il lit les fichiers situ�s dans 
 <literal>Dir::Etc::Parts</literal> ainsi que le principal fichier de configuration
 indiqu� par <literal>Dir::Etc::main</literal>&nbsp;; enfin il applique les options de 
-la ligne de commande qui annulent les directives de configuration, chargeant,
-si n�cessaire, d'autres fichiers de configuration.
+la ligne de commande qui pr�valent sur les directives de configuration, chargeant
+si n�cessaire d'autres fichiers de configuration.
    </para>
 <para>
 Le fichier de configuration est construit comme un arbre d'options
 organis�es en groupes fonctionnels. On se sert du double deux points (�&nbsp;::&nbsp;�) 
 pour indiquer une option&nbsp;; par exemple, <literal>APT::Get::Assume-Yes</literal> est
-une option pour le groupe d'outils APT, destin�e � l'outil Get. Les options
-n'h�ritent pas des groupes de leurs parents.
+une option pour le groupe d'outils APT, destin�e � l'outil Get. Il n'y a pas d'h�ritage
+des options des groupes parents.
    </para>
 <para>
 Syntaxiquement, le langage de configuration est con�u sur le m�me mod�le
 que les langages utilis�s par des outils ISC tels que bind et dhcp. Une ligne
-qui commence par <literal>//</literal> est un commentaire et elle est ignor�e.
+qui commence par <literal>//</literal> est trait�e comme un commentaire et ignor�e, de
+m�me que les sections de texte plac�es entre <literal>/*</literal> et
+<literal>*/</literal>, tout comme les commentaires C/C++.
 Chaque ligne est de la forme&nbsp;:
-   <literal>APT::Get::Assume-Yes "true";</literal> 
+<informalexample><programlisting>
+<literal>APT::Get::Assume-Yes "true";</literal> 
+     </programlisting></informalexample>
 Le point-virgule final est obligatoire et les guillemets sont optionnels.
 On peut d�clarer un nouveau champ d'action avec des accolades, comme 
 suit&nbsp;:
@@ -68,10 +72,9 @@ APT {
 </programlisting></informalexample>
 
 <para>
-avec des retours � la ligne pour faciliter la lecture. On peut cr�er des 
-listes en ouvrant un champ d'action et en mettant un seul mot entre 
-apostrophes suivi d'un point-virgule. On peut mettre plusieurs entr�es,
-s�par�es par un point-virgule.
+avec des retours � la ligne pour faciliter la lecture. On peut cr�er une liste
+en ouvrant un champ d'action et en y ins�rant une cha�ne entre guillemets suivie
+d'un point virgule pour chaque �l�ment de la liste.
 </para>
 
 <informalexample><programlisting>   
@@ -79,14 +82,21 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 </programlisting></informalexample>
 
 <para>
-Les mod�les <filename>&docdir;examples/apt.conf</filename> &configureindex;
+Les mod�les <filename>&docdir;examples/apt.conf</filename> et &configureindex;
 montrent � quoi devrait ressembler le fichier de configuration.
    </para>
 <para>
+Les identifiants des options de configuration ne sont pas sensibles � la casse.
+Dans l'exemple pr�c�dent, on pourrait donc aussi bien utiliser 
+<literal>dpkg::pre-install-pkgs</literal>.
+   </para>
+<para>
 Deux �l�ments sp�ciaux sont autoris�s&nbsp;: <literal>#include</literal> et 
-<literal>#clear</literal>. <literal>#include</literal> inclut le fichier donn� en argument,
-� moins que le nom ne se termine par une barre oblique. <literal>#clear</literal> sert � 
-effacer une liste de noms.
+<literal>#clear</literal>. <literal>#include</literal> inclut le fichier donn� en
+argument, � moins que le nom ne se termine par une barre oblique auquel cas le
+r�pertoire entier est inclus. <literal>#clear</literal> sert � 
+effacer une partie de l'arbre de configuration. L'�l�ment d�sign� et tout ses
+descendants sont supprim�s.
    </para>
 <para>
 Tous les outils d'APT poss�dent une option <option>-o</option> qui permet de 
@@ -95,20 +105,31 @@ syntaxe consiste en un nom complet d'option (par exemple
 <literal>APT::Get::Assume-Yes</literal>) suivi par un signe �gal, puis par la nouvelle 
 valeur de l'option. On peut compl�ter une liste en ajoutant un �&nbsp;::&nbsp;� au nom 
 de la liste.
- </para>
+   </para>
 </refsect1>
 
 <refsect1><title>Le groupe APT</title>
-<para>   
-Ce groupe d'options contr�le aussi bien le comportement global d'APT que
-la prise en compte des options pour chaque outil.
+<para>
+Ce groupe d'options contr�le le comportement global d'APT et contient �galement
+des options communes � tous les outils.
 </para>
    <variablelist>
 <varlistentry><term>Architecture</term>
 <listitem><para>
 L'architecture du syst�me&nbsp;; cette option positionne l'architecture � utiliser 
-pour r�cup�rer des fichiers et analyser des listes de paquets. L'architecture 
-interne par d�faut est celle pour laquelle APT a �t� compil�.
+pour r�cup�rer des fichiers et analyser des listes de paquets. La valeur interne par
+d�faut est l'architecture pour laquelle APT a �t� compil�.
+     </para></listitem>
+</varlistentry>
+
+<varlistentry><term>Default-Release</term>
+<listitem><para>
+Indique la distribution � utiliser par d�faut lors de l'installation d'un
+paquet si plusieurs versions sont disponibles. La valeur peut �tre un nom de
+distribution ou un num�ro de version. Exemples&nbsp;: �&nbsp;stable&nbsp;�,
+�&nbsp;testing&nbsp;�, �&nbsp;4.0&nbsp;�, �&nbsp;5.0*&nbsp;�. Les noms de codes
+des distributions (�&nbsp;etch&nbsp;�, �&nbsp;lenny&nbsp;�, etc.) ne sont pas
+permis pour l'instant. Voir aussi &apt-preferences;.
      </para></listitem>
 </varlistentry>
 
@@ -123,7 +144,7 @@ dans sa prise de d�cision.
 <varlistentry><term>Clean-Installed</term>
 <listitem><para>
 Avec cette option qui est activ�e par d�faut, la fonctionnalit� �&nbsp;autoclean&nbsp;�
-supprime tout paquet qui ne peut plus �tre r�cup�r� dans le cache.
+supprime du cache tout paquet qui ne peut plus �tre r�cup�r�.
 Quand cette option est d�sactiv�e, les paquets qui sont install�s localement
 sont aussi exclus du nettoyage - mais notez que APT ne fournit aucun moyen
 direct pour les r�installer.
@@ -134,9 +155,9 @@ direct pour les r�installer.
 <listitem><para>
 D�sactive la configuration imm�diate&nbsp;; cette dangereuse option d�sactive
 une partie du code de mise en ordre de APT pour que ce dernier effectue le
-moins d'appels possible � Dpkg. C'est peut-�tre n�cessaire sur des syst�mes
-lents � un seul utilisateur mais c'est extr�mement dangereux et cela peut 
-faire �chouer les scripts d'installation, voire pire.
+moins d'appels possible � &dpkg;. �a peut �tre n�cessaire sur des syst�mes
+� un seul utilisateur extr�mement lents, mais cette option est tr�s dangereuse et
+peut faire �chouer les scripts d'installation, voire pire.
 Utilisez-la � vos risques et p�rils.
      </para></listitem>
 </varlistentry>
@@ -155,39 +176,37 @@ ou tous les paquets dont ces paquets d�pendent.
 
 <varlistentry><term>Cache-Limit</term>
 <listitem><para>
-APT utilise un fichier cache d'une taille m�moire fixe pour ranger les
-informations du fichier �&nbsp;available&nbsp;�. Cette option fixe la taille 
-de ce cache.
+APT utilise un fichier de cache charg� en m�moire avec mmap pour ranger les
+informations sur les paquets disponibles. Cette option fixe la taille m�moire
+allou�e pour le chargement de ce cache.
      </para></listitem>
 </varlistentry>
 
 <varlistentry><term>Build-Essential</term>
 <listitem><para>
      Cette option d�finit les paquets qui sont consid�r�s comme faisant partie
-des d�pendances essentielles pour la construction des paquets.
+des d�pendances essentielles pour la construction de paquets.
      </para></listitem>
 </varlistentry>
 
 <varlistentry><term>Get</term>
 <listitem><para>La sous-section <literal>Get</literal> contr�le l'outil &apt-get;, 
-veuillez consulter
-sa documentation pour avoir plus d'informations sur les options en question.
+veuillez consulter sa documentation pour avoir plus d'informations sur les options
+en question.
      </para></listitem>
 </varlistentry>
 
 <varlistentry><term>Cache</term>
-<listitem><para>La sous-section <literal>Cache</literal> contr�le l'outil &apt-cache;, 
-veuillez 
-consulter sa documentation pour avoir plus d'informations sur les options en 
-question.
+<listitem><para>La sous-section <literal>Cache</literal> contr�le l'outil
+&apt-cache;, veuillez consulter sa documentation pour avoir plus d'informations
+sur les options en question.
      </para></listitem>
 </varlistentry>
 
 <varlistentry><term>CDROM</term>
-<listitem><para>La sous-section <literal>CDROM</literal> contr�le l'outil&apt-cdrom;, 
-veuillez 
-consulter sa documentation pour avoir plus d'informations sur les options en 
-question.
+<listitem><para>La sous-section <literal>CDROM</literal> contr�le l'outil
+&apt-cdrom;, veuillez consulter sa documentation pour avoir plus d'informations
+sur les options en question.
      </para></listitem>
 </varlistentry>
 </variablelist>
@@ -199,13 +218,20 @@ Le groupe d'options <literal>Acquire</literal> contr�le le t�l�chargement des pa
 les gestionnaires d'URI.
 
    <variablelist>
+<varlistentry><term>PDiffs</term>
+<listitem><para>Essayer de t�l�charger les fichiers diff�rentiels appel�s
+<literal>PDiffs</literal> pour les paquets ou les fichiers sources, plut�t que
+de les t�l�charger enti�rement. Par d�faut � �&nbsp;true&nbsp;�.
+     </para></listitem>
+</varlistentry>
+
 <varlistentry><term>Queue-Mode</term>
 <listitem><para>
-Le mode file d'attente&nbsp;; <literal>Queue-Mode</literal> peut prendre une valeur 
-parmi <literal>host</literal> ou <literal>access</literal> et cela d�termine comment APT 
-parall�lise les connexions sortantes. <literal>Host</literal> signifie qu'une 
-connexion par cible sera initi�e, tandis que <literal>access</literal> signifie qu'une 
-connexion par type d'URI sera initi�e.
+Le mode de file d'attente&nbsp;; <literal>Queue-Mode</literal> peut prendre les
+valeurs <literal>host</literal> ou <literal>access</literal> et cela d�termine
+comment APT parall�lise les connexions sortantes. <literal>Host</literal> signifie
+qu'une connexion par cible sera initi�e, tandis que <literal>access</literal> signifie
+qu'une connexion par type d'URI sera initi�e.
      </para></listitem>
 </varlistentry>
 
@@ -227,30 +253,32 @@ Par d�faut � �&nbsp;true&nbsp;�.
 
 <varlistentry><term>http</term>
 <listitem><para>
-URI HTTP ; http::Proxy est le mandataire (proxy) http � utiliser par d�faut.
+URI HTTP&nbsp;; http::Proxy est le mandataire (proxy) HTTP � utiliser par d�faut.
 Il se pr�sente sous la forme standard&nbsp;:
-<literal>http://[[user][:pass]@]host[:port]/</literal>. En utilisant la syntaxe&nbsp;:
-<literal>http::Proxy::&lt;host&gt;</literal>, o� le mot-cl� sp�cial <literal>DIRECT</literal>
-indique de n'utiliser aucun mandataire, on peut sp�cifier un mandataire
-pour chaque machine distante. La variable d'environnement <envar>http_proxy</envar>
-remplace tous ces param�tres.
+<literal>http://[[user][:pass]@]host[:port]/</literal>. On peut sp�cifier un
+mandataire particulier par h�te distant en utilisant la syntaxe&nbsp;:
+<literal>http::Proxy::&lt;h�te&gt;</literal>. Le mot-cl� sp�cial
+<literal>DIRECT</literal> indique alors de n'utiliser aucun mandataire pour
+l'h�te.
+Lorsqu'elle est d�finie, la variable d'environnement <envar>http_proxy</envar>
+annule et remplace toutes les options de mandataire HTTP.
      </para>
 <para>
-Trois options de configuration sont fournies pour le contr�le des caches qui
-sont compatibles avec HTTP/1.1. <literal>No-Cache</literal> signifie que le mandataire
-ne doit pas du tout utiliser les r�ponses qu'il a stock�es&nbsp;; <literal>Max-Age</literal>
+Trois options de configuration sont fournies pour le contr�le des caches compatibles
+avec HTTP/1.1. <literal>No-Cache</literal> signifie que le mandataire ne doit jamais
+utiliser les r�ponses qu'il a stock�es&nbsp;; <literal>Max-Age</literal>
 sert uniquement pour les fichiers d'index&nbsp;: cela demande au cache de les 
 mettre � jour quand leur anciennet� est sup�rieure au nombre de secondes 
-donn�. Debian met � jour son fichier d'index de mani�re journali�re, la
+donn�. Debian met � jour ses fichiers d'index de mani�re quotidienne&nbsp;; la
 valeur par d�faut est donc de 1 jour. <literal>No-Store</literal> sert uniquement
-pour les fichiers d'archive&nbsp;: cela demande au cache de ne jamais garder 
+pour les fichiers d'archive&nbsp; et demande au cache de ne jamais garder 
 la requ�te. Cela peut �viter de polluer un cache mandataire avec des 
 fichiers .deb tr�s grands. Note&nbsp;: Squid 2.0.2 ne prend en compte aucune de 
 ces options.
      </para>
 <para>
 L'option <literal>timeout</literal> positionne le compteur de temps mort (timeout)
-utilis� par la m�thode&nbsp;: cela vaut pour tout (connexion, donn�es).
+utilis� par la m�thode. Cela vaut pour tout, connexion et donn�es.
      </para>
 <para>
 Une option de configuration est fournie pour contr�ler la profondeur du tube
@@ -264,27 +292,62 @@ ne respectent pas la RFC 2068.
      </para></listitem>
 </varlistentry>
 
+<varlistentry><term>https</term>
+<listitem><para>
+URI HTTPS. Les options de contr�le de cache et de mandataire (proxy) sont les
+m�mes que pour la m�thode <literal>http</literal>. L'option
+<literal>Pipeline-Depth</literal> n'est pas encore support�e.
+     </para>
+
+<para>La sous-option <literal>CaInfo</literal> sp�cifie le fichier contenant
+les informations sur les certificats de confiance.
+La sous-option bool�enne <literal>Verify-Peer</literal> pr�cise si le
+certificat d'h�te du serveur doit �tre confront� aux certificats de confiance
+ou pas. La sous-option bool�enne <literal>Verify-Host</literal> pr�cise s'il
+faut v�rifier ou pas le nom d'h�te du serveur. <literal>SslCert</literal>
+d�termine le certificat � utiliser pour l'authentification du client.
+<literal>SslKey</literal> d�termine quelle clef priv�e doit �tre utilis�e pour
+l'authentification du client. <literal>SslForceVersion</literal> surcharge la
+valeur par d�faut pour la version de SSL � utiliser et peut contenir l'une des
+cha�nes 'TLSv1' ou 'SSLv3'.
+     </para>
+<para>Chacune de ces options peut �tre sp�cifi�e pour un h�te particulier en
+utilisant <literal>&lt;h�te&gt;::CaInfo</literal>,
+<literal>&lt;h�te&gt;::Verify-Peer</literal>,
+<literal>&lt;h�te&gt;::Verify-Host</literal>,
+<literal>&lt;h�te&gt;::SslCert</literal>,
+<literal>&lt;h�te&gt;::SslKey</literal> et
+<literal>&lt;h�te&gt;::SslForceVersion</literal> respectivement.
+     </para></listitem>
+</varlistentry>
+
 <varlistentry><term>ftp</term>
 <listitem><para>
-URI FTP ; ftp::Proxy est le serveur mandataire par d�faut � utiliser. Il se
-pr�sente sous la forme standard&nbsp;: 
-<literal>ftp://[[user][:pass]@]host[:port]/</literal>&nbsp;; il est remplac� par la 
-variable d'environnement <envar>ftp_proxy</envar>. Pour utiliser un mandataire ftp,
-vous devez renseigner l'entr�e <literal>ftp::ProxyLogin</literal> dans le fichier de
-configuration. Cette entr�e sp�cifie les commandes qui disent au serveur
-mandataire comment se connecter. Voyez &configureindex; pour savoir
-comment faire. Les variables de substitution disponibles sont&nbsp;:
-<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>,
-<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, et <literal>$(SITE_PORT)</literal>.
-Chacune correspond � un �l�ment de l'URI.
+URI FTP&nbsp;; ftp::Proxy est le mandataire (proxy) FTP � utiliser par d�faut.
+Il se pr�sente sous la forme standard&nbsp;: 
+<literal>ftp://[[user][:pass]@]host[:port]/</literal>. On peut sp�cifier un
+mandataire particulier par h�te distant en utilisant la syntaxe&nbsp;:
+<literal>ftp::Proxy::&lt;h�te&gt;</literal>. Le mot-cl� sp�cial
+<literal>DIRECT</literal> indique alors de n'utiliser aucun mandataire pour
+l'h�te. Lorsqu'elle est d�finie, la variable d'environnement
+<envar>ftp_proxy</envar> annule et replace toutes les options de mandataire
+FTP. Pour utiliser un mandataire FTP, vous devrez renseigner l'entr�e
+<literal>ftp::ProxyLogin</literal> dans le fichier de configuration. Cette
+entr�e sp�cifie les commandes � envoyer au mandataire pour lui pr�ciser � quoi
+il doit se connecter. Voyez &configureindex; pour savoir comment faire. Les
+variables de substitution disponibles sont&nbsp;:
+<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>,
+<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>,
+<literal>$(SITE)</literal> et <literal>$(SITE_PORT)</literal>. Chacune
+correspond � l'�l�ment respectif de l'URI.
      </para>
 <para>
-L'option <literal>timeout</literal> positionne le compteur de temps mort (timeout)
-utilis� par la m�thode&nbsp;: cela vaut pour tout (connexion, donn�es).
+L'option <literal>timeout</literal> positionne le compteur de temps mort
+(timeout) utilis� par la m�thode. Cela vaut pour tout, connexion et donn�es.
      </para>
 <para>
 Plusieurs options de configuration sont fournies pour contr�ler le mode 
-passif. G�n�ralement, c'est plus s�r d'activer le mode passif&nbsp;; cela 
+passif. Il est g�n�ralement plus s�r d'activer le mode passif et cela 
 marche dans presque tous les environnements. Cependant, certaines situations
 n�cessitent que le mode passif soit d�sactiv� et que le mode 
 �&nbsp;port&nbsp;� de ftp
@@ -293,16 +356,18 @@ connexions qui passent par un mandataire ou pour une machine
 sp�cifique (examinez le mod�le de fichier de configuration).
      </para>
 <para>
-On peut utiliser un mandataire FTP pour atteindre une cible HTTP en
-positionnant la variable d'environnement <envar>ftp_proxy</envar> � une url http --
-consultez la m�thode http ci-dessus pour la syntaxe. On ne peut pas fixer
-cette variable dans le fichier de configuration et il n'est pas recommand�
-d'utiliser HTTP par FTP � cause de son peu d'efficacit�.
+Il est possible de faire transiter le trafic FTP par un mandataire HTTP en
+positionnant la variable d'environnement <envar>ftp_proxy</envar> � une URL
+HTTP --
+consultez la m�thode http ci-dessus pour la syntaxe. On ne peut pas le faire
+dans le fichier de configuration et il n'est de toute fa�on pas recommand�
+d'utiliser FTP au travers de HTTP en raison la faible efficacit� de cette
+m�thode.
      </para>
 <para>
 L'option <literal>ForceExtended</literal> contr�le l'utilisation des commandes li�es 
 � la RFC 2428, <literal>EPSV</literal> et <literal>EPRT</literal>. Par d�faut, elle vaut 
-�&nbsp;false&nbsp;�&nbsp;; ce qui signifie que ces commandes ne sont 
+�&nbsp;false&nbsp;� ce qui signifie que ces commandes ne sont 
 utilis�es que pour une connexion de type IPv6. Quand elle vaut 
 �&nbsp;true&nbsp;�, on les utilise m�me si la connexion est de type IPv4. La 
 plupart des serveurs FTP ne suivent pas la RFC 2428.
@@ -311,7 +376,7 @@ plupart des serveurs FTP ne suivent pas la RFC 2428.
 
 <varlistentry><term>cdrom</term>
 <listitem><para>
-URI CDROM&nbsp;; la seule option de configuration pour les URI de CDROM
+URI c�d�rom&nbsp;; la seule option de configuration pour les URI de c�d�rom
 est le point de montage&nbsp;: <literal>cdrom::Mount</literal>&nbsp;; il doit 
 repr�senter le point de montage du lecteur de c�d�rom indiqu� dans 
 <filename>/etc/fstab</filename>. 
@@ -326,9 +391,9 @@ peuvent �tre sp�cifi�es en utilisant <literal>UMount</literal>.
 
      <varlistentry><term>gpgv</term>
      <listitem><para>
-URI GPGV ; la seule option pour les URI GPGV est celle qui permet de
+URI GPGV&nbsp;; la seule option pour les URI GPGV est celle qui permet de
      passer des param�tres � gpgv.
-     <literal>gpgv::Options</literal> Options suppl�mentaires pass�es �
+     <literal>gpgv::Options</literal>&nbsp;: options suppl�mentaires pass�es �
      gpgv.
 </para>
 	  </listitem>
@@ -341,7 +406,8 @@ URI GPGV ; la seule option pour les URI GPGV est celle qui permet de
 <para>   
 Les r�pertoires de la section <literal>Dir::State</literal> concernent le syst�me
 local. <literal>lists</literal> est le r�pertoire o� placer les listes de paquets
-t�l�charg�s et <literal>status</literal> est le nom du fichier d'�tat de Dpkg.
+t�l�charg�s et <literal>status</literal> est le nom du fichier d'�tat de
+&dpkg;.
 <literal>preferences</literal> concerne APT&nbsp;: c'est le nom du fichier des 
 pr�f�rences.
 <literal>Dir::State</literal> contient le r�pertoire par d�faut pr�fix� � tous les
@@ -353,8 +419,8 @@ ou <filename>./</filename>.
 cache local&nbsp;: par exemple, les deux caches de paquets 
 <literal>srcpkgcache</literal> et <literal>pkgcache</literal>, et aussi l'endroit o� sont 
 plac�es les archives t�l�charg�es, <literal>Dir::Cache::archives</literal>. On peut 
-emp�cher la cr�ation des caches en laissant leur nom en blanc. Cela ralentit 
-le d�marrage mais cela sauve de l'espace disque. Il vaut mieux se passer du 
+emp�cher la cr�ation des caches en saisissant un nom vide. Cela ralentit 
+le d�marrage mais sauve de l'espace disque. Il vaut mieux se passer du 
 cache <literal>pkgcache</literal> plut�t que se passer du cache <literal>srcpkgcache</literal>. 
 Comme pour <literal>Dir::State</literal>, le r�pertoire par d�faut est contenu dans
 <literal>Dir::Cache</literal>.
@@ -375,11 +441,22 @@ de configuration est charg�.
 Les programmes binaires sont point�s par <literal>Dir::Bin</literal>.
 L'emplacement des gestionnaires de m�thodes est indiqu� par
 <literal>Dir::Bin::Methods</literal>&nbsp;; <literal>gzip</literal>, 
-<literal>Dpkg</literal>, <literal>apt-get</literal>,
+<literal>dpkg</literal>, <literal>apt-get</literal>,
 <literal>dpkg-source</literal>, <literal>dpkg-buildpackage</literal> 
 et <literal>apt-cache</literal>
 indiquent l'emplacement des programmes correspondants.
- </para>
+   </para>
+<para>
+L'option de configuration <literal>RootDir</literal> a une signification
+particuli�re. Lorsqu'elle est d�finie, tous les chemins d�clar�s dans
+<literal>Dir::</literal> sont consid�r�s relativement �
+<literal>RootDir</literal>, <emphasis>m�me les chemins sp�cifi�s de mani�re
+absolue</emphasis>. Ainsi par exemple si <literal>RootDir</literal> est
+d�fini comme <filename>/tmp/staging</filename>, et que chemin du fichier d'�tat
+<literal>Dir::State::status</literal> est d�clar� comme
+<filename>/var/lib/dpkg/status</filename> alors ce fichier sera cherch�
+dans <filename>/tmp/staging/var/lib/dpkg/status</filename>.
+   </para>
 </refsect1>
 
 <refsect1><title>APT et DSelect</title>
@@ -406,14 +483,14 @@ de nouveaux paquets.
 
 <varlistentry><term>Options</term>
 <listitem><para>
-Le contenu de cette variable est pass� � &apt-get; avec les options de la ligne
-de commande quand ce programme est utilis� dans la phase d'installation.
+Le contenu de cette variable est pass� comme options de ligne de commande �
+&apt-get; lors de la phase d'installation.
      </para></listitem>
 </varlistentry>
 <varlistentry><term>UpdateOptions</term>
 <listitem><para>
-Le contenu de cette variable est pass� � &apt-get; avec les options de la 
-ligne de commande quand ce programme est utilis� dans la phase de mise � jour.
+Le contenu de cette variable est pass� comme options de ligne de commande �
+&apt-get; lors de la phase de mise � jour.
      </para></listitem>
 </varlistentry>
 
@@ -427,7 +504,7 @@ qu'en cas d'erreur que l'on propose � l'utilisateur d'intervenir.
 </variablelist>
 </refsect1>
 
-<refsect1><title>Comment APT appelle Dpkg</title>
+<refsect1><title>Comment APT appelle &dpkg;</title>
 <para>   
 Plusieurs directives de configuration contr�lent la mani�re dont APT
 invoque &dpkg;&nbsp;: elles figurent dans la section <literal>DPkg</literal>.
@@ -435,8 +512,8 @@ invoque &dpkg;&nbsp;: elles figurent dans la section <literal>DPkg</literal>.
    <variablelist>
 <varlistentry><term>Options</term>
 <listitem><para>
-Il s'agit d'une liste d'options � passer � dpkg. Les options doivent �tre
-d�clar�es en utilisant la notation de liste et chaque �l�ment de liste est
+Il s'agit d'une liste d'options � passer � &dpkg;. Les options doivent �tre
+d�clar�es en utilisant la notation de liste et chaque �l�ment de la liste est
 pass� comme un seul argument � &dpkg;.
      </para></listitem>
 </varlistentry>
@@ -450,7 +527,7 @@ liste. Les commandes sont appel�es dans l'ordre, en utilisant
 </varlistentry>
 <varlistentry><term>Pre-Install-Pkgs</term>
 <listitem><para>
-Il s'agit d'une liste de commandes shell � ex�cuter avant d'appeler Dpkg. 
+Il s'agit d'une liste de commandes shell � ex�cuter avant d'appeler &dpkg;. 
 Tout comme pour <literal>Options</literal>, on doit utiliser la notation de liste.
 Les commandes sont appel�es dans l'ordre, en utilisant 
 <filename>/bin/sh</filename>&nbsp;: APT s'arr�te d�s que l'une d'elles �choue. Sur 
@@ -467,7 +544,7 @@ commande pass�e � <literal>Pre-Install-Pkgs</literal>.
 </varlistentry>
 <varlistentry><term>Run-Directory</term>
 <listitem><para>
-APT se place dans ce r�pertoire avant d'appeler Dpkg&nbsp;; par d�faut c'est 
+APT se place dans ce r�pertoire avant d'appeler &dpkg;&nbsp;; par d�faut c'est 
 le r�pertoire <filename>/</filename>.
      </para></listitem>
 </varlistentry>
@@ -481,25 +558,262 @@ cr��s.
 </variablelist>
  </refsect1>
 
+<refsect1>
+<title>Options �&nbsp;Periodic&nbsp;� et �&nbsp;Archive&nbsp;�</title>
+<para>
+Les groupes d'options <literal>APT::Periodic</literal> et
+<literal>APT::Archive</literal> configurent les comportements p�riodiques
+r�alis�s par le script <literal>/etc/cron.daily/apt</literal>, lanc�
+quotidiennement.
+   </para>
+<variablelist>
+<varlistentry><term>APT::Periodic</term>
+<para>Les options de cette section permettent de configurer la fr�quence
+d'ex�cution des t�ches APT lanc�es automatiquement. Ces param�tre prennent
+comme valeurs des p�riodicit�s d'ex�cution en nombre de jours.
+   </para>
+<listitem><para>
+<literal>Update-Package-List</literal>&nbsp;: p�riodicit� de mise � jour de la
+liste des paquets disponibles. (0 = d�sactiv�)
+     </para></listitem>
+<listitem><para>
+<literal>Download-Upgradable-Packages</literal>&nbsp;: p�riodicit� de
+t�l�chargement dans le cache des paquets pour lesquels une mise � jour est
+disponible. (0 = d�sactiv�)
+     </para></listitem>
+<listitem><para>
+<literal>AutocleanInterval</literal>&nbsp;: p�riodicit� des
+�&nbsp;autoclean&nbsp;�, c'est � dire de la suppression du cache des paquets
+qui ne peuvent plus �tre t�l�charg�s. (0 = d�sactiv�)
+     </para></listitem>
+<listitem><para>
+<literal>Unattended-Upgrade</literal>&nbsp;: p�riodicit� de mise � jour
+automatique du syst�me sans intervention humaine. Le paquet
+<literal>unattended-upgrades</literal> doit �tre install� pour que cette t�che
+s'ex�cute. Le cas �ch�ant un fichier journal est �crit dans
+<literal>/var/log/unattended-upgrades</literal>. (0 = d�sactiv�)
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>APT::Archive</term>
+<para>Les options de la section APT::Archive permettent de contr�ler la taille
+du cache de paquets.
+   </para>
+<listitem><para>
+<literal>MaxAge</literal>&nbsp;: anciennet� maximale d'un paquet dans le cache,
+en nombre de jours. Les paquets plus anciens sont supprim�s. (0 = d�sactiv�)
+     </para></listitem>
+<listitem><para>
+<literal>MaxSize</literal>&nbsp;: taille maximale du cache en Mo. (0 =
+d�sactive) Si ce maximum est d�pass�, des paquets sont supprim�s jusqu'� ce
+que la taille du cache repasse sous la limite. Les paquets les plus volumineux
+sont supprim�s en premier.
+     </para></listitem>
+<listitem><para>
+<literal>MinAge</literal>&nbsp;: age minimum d'un paquet du cache, en nombre de
+jours (0 = d�sactiv�). Un paquet plus r�cent ne sera pas supprim�. Cette option
+est utile pour garder � disposition une version des paquets en cas de probl�me
+grave.
+     </para></listitem>
+</varlistentry>
+</variablelist>
+</refsect1>
+
 <refsect1><title>Les options de d�bogage</title>
-<para>   
-La plupart des options de la section <literal>debug</literal> n'ont aucun int�r�t
-pour le simple utilisateur&nbsp;; cependant, 
-<literal>Debug::pkgProblemResolver</literal> affiche d'int�ressantes informations sur 
-les d�cisions que prend la commande dist-upgrade. <literal>Debug::NoLocking</literal> 
-d�sactive le verrouillage de fichier de mani�re � ce que APT puisse effectuer 
-quelques op�rations sans �tre �&nbsp;root&nbsp;� et 
-<literal>Debug::pkgDPkgPM</literal> affiche la ligne de commande � chaque appel de 
-Dpkg. <literal>Debug::IdentCdrom</literal> d�sactive l'inclusion de 
-donn�es de type statfs dans les ID de CDROM.
-<literal>Debug::Acquire::gpgv</literal> D�bogage de la m�thode gpgv.
- </para>
+<para>
+Les options de la section <literal>Debug::</literal> servent soit � provoquer
+l'affichage d'informations de d�bogage sur la sortie d'erreur standard du
+programme qui utilise les librairies APT, soit � activer des modes de
+fonctionnement sp�ciaux qui sont principalement utiles pour d�boguer le
+comportement de <literal>APT</literal>. La plupart de ces options n'ont pas
+d'int�r�t pour un utilisateur normal, mais certaines peuvent tout de m�me �tre
+utiles&nbsp;:
+   </para>
+<itemizedlist>
+<listitem><para>
+<literal>Debug::pkgProblemResolver</literal> affiche d'int�ressantes
+informations sur les d�cisions prises par les commandes <literal>dist-upgrade,
+upgrade, install, remove et purge</literal>.
+     </para></listitem>
+<listitem><para>
+<literal>Debug::NoLocking</literal> d�sactive le verrouillage de fichier de
+mani�re � ce que APT puisse effectuer quelques op�rations (telles que
+<literal>apt-get -s install</literal>) sans �tre �&nbsp;root&nbsp;�.
+     </para></listitem>
+<listitem><para>
+<literal>Debug::pkgDPkgPM</literal> affiche la ligne de commande � chaque appel
+de &dpkg;.
+     </para></listitem>
+<listitem><para>
+<literal>Debug::IdentCdrom</literal> d�sactive l'inclusion de donn�es de type
+statfs dans les ID de c�d�rom.
+     </para></listitem>
+</itemizedlist>
+
+<para>Voici une liste compl�te des options de d�bogage de APT.</para>
+<variablelist>
+<varlistentry><term>Debug::Acquire::cdrom</term>
+<listitem><para>
+Affiche les informations concernant les sources de type cdrom://
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::Acquire::ftp</term>
+<listitem><para>
+Affiche les informations concernant le t�l�chargement de paquets par FTP.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::Acquire::http</term>
+<listitem><para>
+Affiche les informations concernant le t�l�chargement de paquets par HTTP.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::Acquire::https</term>
+<listitem><para>
+Affiche les informations concernant le t�l�chargement de paquets par HTTPS.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::Acquire::gpgv</term>
+<listitem><para>
+Affiche les informations relatives � la v�rification de signatures
+cryptographiques avec <literal>gpg</literal>.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::aptcdrom</term>
+<listitem><para>
+Affiche des informations concernant l'acc�s aux collections de paquets
+stock�es sur c�d�rom.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::BuildDeps</term>
+<listitem><para>
+D�crit le processus de r�solution des d�pendances pour la construction de
+paquets source (&nbsp;�&nbsp;build-dependencies&nbsp;�&nbsp;) par &apt-get;.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::Hashes</term>
+<listitem><para>
+Affiche toutes les clefs de hachage cryptographiques g�n�r�es par les
+librairies APT.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::IdentCdrom</term>
+<listitem><para>D�sactive l'inclusion des donn�es de type
+<literal>statfs</literal> pour la g�n�ration des ID de c�d�rom, � savoir le
+nombre de blocs libres et utilis�s sur le syst�me de fichier du c�d�rom.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::NoLocking</term>
+<listitem><para>
+D�sactive le verrouillage de fichiers. Cela permet par exemple de lancer deux
+instances de �&nbsp;apt-get update&nbsp;� en m�me temps.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgAcquire</term>
+<listitem><para>
+Trace les ajouts et suppressions d'�l�ments de la queue globale de
+t�l�chargement.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgAcquire::Auth</term>
+<listitem><para>
+Affiche les d�tails de la v�rification des sommes de contr�le et des signatures
+cryptographiques des fichiers t�l�charg�s, ainsi que les erreurs �ventuelles.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgAcquire::Diffs</term>
+<listitem><para>
+Affiche les informations de t�l�chargement et de prise en compte des fichiers
+diff�rentiels des indexes de paquets, ainsi que les erreurs �ventuelles.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgAcquire::RRed</term>
+<listitem><para>
+Affiche les d�tails de la v�rification des sommes de contr�le et des signatures
+cryptographiques des fichiers t�l�charg�s, ainsi que les erreurs �ventuelles.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgAcquire::Worker</term>
+<listitem><para>
+Affiche toutes les interactions avec les processus enfants qui se chargent
+effectivement des t�l�chargements.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgAcquire::pkgAutoRemove</term>
+<listitem><para>
+Affiche les changements concernant le marquage des paquets comme install�s
+automatiquement, et la suppression des paquets inutiles. 
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgDepCache::AutoInstall</term>
+<listitem><para>
+G�n�re les informations de d�bogage d�crivant quels paquets sont install�s
+automatiquement pour satisfaire les d�pendances. Cela concerne la passe
+initiale d'installation automatique effectu�e par exemple par
+<literal>apt-get install</literal> et pas le syst�me de r�solution de
+d�pendances complet de APT&nbsp;; voir
+<literal>Debug::pkgProblemResolver</literal> pour ce dernier.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgInitConfig</term>
+<listitem><para>
+Au lancement, affiche l'ensemble de la configuration sur la sortie d'erreur
+standard.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgDPkgPM</term>
+<listitem><para>
+Affiche la commande exacte d'invocation de &dpkg; � chaque appel&nbsp;; les
+arguments sont s�par�s par des espaces.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgDPkgProgressReporting</term>
+<listitem><para> Affiche l'ensemble des informations re�ues de &dpkg; par
+l'interm�diaire du descripteur de fichier d'�tat, et les �ventuelles erreurs
+d'analyse de ce fichier.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgOrderList</term>
+<listitem><para>
+Affiche les �tapes de l'algorithme utilis� pour choisir l'ordre dans lequel APT
+passe les paquets � &dpkg;.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgPackageManager</term>
+<listitem><para>
+Affiche le d�tail des op�rations li�es � l'invocation de &dpkg;. 
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgPolicy</term>
+<listitem><para>
+Au lancement, affiche la priorit� de chaque liste de paquets.
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::pkgProblemResolver</term>
+<listitem><para>
+Affiche la trace d'ex�cution du syst�me de r�solution de d�pendances (ne
+concerne que les cas o� un probl�me de d�pendances complexe se pr�sente).
+     </para></listitem>
+</varlistentry>
+<varlistentry><term>Debug::sourceList</term>
+<listitem><para>
+Affiche les fournisseurs d�clar�s dans le fichier
+<filename>/etc/apt/vendors.list</filename>.
+     </para></listitem>
+</varlistentry>
+<!-- 2009/07/11 Utilis� nulle part actuellement, le code est comment�.
+<varlistentry><term>Debug::Vendor</term>
+<listitem><para>
+Affiche les informations sur la recherche de fournisseurs.
+     </para></listitem>
+</varlistentry>
+-->
+</variablelist>
+
 </refsect1>
 
 <refsect1><title>Exemples</title>
 <para>
-Le fichier &configureindex; contient un mod�le de fichier montrant les valeurs par
-d�faut de toutes les options possibles.
+Le fichier &configureindex; contient un mod�le de fichier montrant des exemples
+pour toutes les options existantes.
  </para>
 </refsect1>
 
@@ -514,4 +828,4 @@ d�faut de toutes les options possibles.
 
 &manbugs;
 &deux-traducteurs;
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/doc/pt_BR/.cvsignore b/doc/pt_BR/.cvsignore
deleted file mode 100644
index 8d11bcc88..000000000
--- a/doc/pt_BR/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-apt_preferences.pt_BR.5
-manpage.links
-manpage.refs
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 601bc11c9..9802eb46c 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -9,6 +9,7 @@
 									/*}}}*/
 // Include Files							/*{{{*/
 #include <apt-pkg/acquire-method.h>
+#include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
@@ -17,6 +18,7 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
+#include <dlfcn.h>
 
 #include <iostream>
 #include <apti18n.h>
@@ -27,15 +29,20 @@ using namespace std;
 class CDROMMethod : public pkgAcqMethod
 {
    bool DatabaseLoaded;
+   bool Debug;
+
    ::Configuration Database;
    string CurrentID;
    string CDROM;
    bool MountedByApt;
-   
+   pkgUdevCdromDevices UdevCdroms;
+ 
+   bool IsCorrectCD(URI want, string MountPath);
+   bool AutoDetectAndMount(URI);
    virtual bool Fetch(FetchItem *Itm);
    string GetID(string Name);
    virtual void Exit();
-   
+      
    public:
    
    CDROMMethod();
@@ -50,14 +57,15 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
                                           DatabaseLoaded(false), 
                                           MountedByApt(false)
 {
+   UdevCdroms.Dlopen();
 };
 									/*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 void CDROMMethod::Exit()
-{
-   if (MountedByApt == true)
+{ 
+  if (MountedByApt == true)
       UnmountCdrom(CDROM);
 }
 									/*}}}*/
@@ -81,16 +89,94 @@ string CDROMMethod::GetID(string Name)
    return string();
 }
 									/*}}}*/
+// CDROMMethod::AutoDetectAndMount                                      /*{{{*/
+// ---------------------------------------------------------------------
+/* Modifies class varaiable CDROM to the mountpoint */
+bool CDROMMethod::AutoDetectAndMount(URI Get)
+{
+   vector<struct CdromDevice> v = UdevCdroms.Scan();
+
+   // first check if its mounted somewhere already
+   for (unsigned int i=0; i < v.size(); i++)
+   {
+      if (v[i].Mounted)
+      {
+	 if (Debug)
+	    clog << "Checking mounted cdrom device " << v[i].DeviceName << endl;
+	 if (IsCorrectCD(Get, v[i].MountPath))
+	 {
+	    CDROM = v[i].MountPath;
+	    return true;
+	 }
+      }
+   }
+
+   // we are not supposed to mount, exit
+   if (_config->FindB("APT::CDROM::NoMount",false) == true)
+      return false;
+
+   // check if we have the mount point
+   if (!FileExists("/media/apt"))
+      mkdir("/media/apt", 0755);
+
+   // now try mounting
+   for (unsigned int i=0; i < v.size(); i++)
+   {
+      if (!v[i].Mounted)
+      {
+	 if(MountCdrom("/media/apt", v[i].DeviceName)) 
+	 {
+	    if (IsCorrectCD(Get, "/media/apt"))
+	    {
+	       MountedByApt = true;
+	       CDROM = "/media/apt";
+	       return true;
+	    } else {
+	       UnmountCdrom("/media/apt");
+	    }
+	 }
+      }
+   }
+
+   return false;
+}
+									/*}}}*/
+// CDROMMethod::IsCorrectCD                                             /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CDROMMethod::IsCorrectCD(URI want, string MountPath)
+{
+   string NewID;
+
+   for (unsigned int Version = 2; Version != 0; Version--)
+   {
+      if (IdentCdrom(MountPath,NewID,Version) == false)
+	 return false;
+      
+      if (Debug)
+	 clog << "ID " << Version << " " << NewID << endl;
+      
+      // A hit
+      if (Database.Find("CD::" + NewID) == want.Host)
+	 return true;
+   }
+   
+   return false;
+}
+									/*}}}*/
 // CDROMMethod::Fetch - Fetch a file					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool CDROMMethod::Fetch(FetchItem *Itm)
 {
+   FetchResult Res;
+
    URI Get = Itm->Uri;
    string File = Get.Path;
-   FetchResult Res;
+   Debug = _config->FindB("Debug::Acquire::cdrom", false);
 
-   bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
+   if (Debug)
+      clog << "CDROMMethod::Fetch " << Itm->Uri << endl;
 
    /* All IMS queries are returned as a hit, CDROMs are readonly so 
       time stamps never change */
@@ -126,38 +212,31 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    }
 
    // We already have a CD inserted, but it is the wrong one
-   if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host)
+   if (CurrentID.empty() == false && 
+       CurrentID != "FAIL" &&
+       Database.Find("CD::" + CurrentID) != Get.Host)
    {
       Fail(_("Wrong CD-ROM"),true);
       return true;
    }
-   
+
    CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+   if (Debug)
+      clog << "Looking for CDROM at " << CDROM << endl;
+
    if (CDROM[0] == '.')
       CDROM= SafeGetCWD() + '/' + CDROM;
    string NewID;
+
    while (CurrentID.empty() == true)
    {
-      bool Hit = false;
+      if (CDROM == "apt-udev-auto/") 
+	 AutoDetectAndMount(Get);
+
       if(!IsMounted(CDROM))
 	 MountedByApt = MountCdrom(CDROM);
-      for (unsigned int Version = 2; Version != 0; Version--)
-      {
-	 if (IdentCdrom(CDROM,NewID,Version) == false)
-	    return false;
-	 
-	 if (Debug == true)
-	    clog << "ID " << Version << " " << NewID << endl;
       
-	 // A hit
-	 if (Database.Find("CD::" + NewID) == Get.Host)
-	 {
-	    Hit = true;
-	    break;
-	 }	 
-      }
-
-      if (Hit == true)
+      if (IsCorrectCD(Get, CDROM))
 	 break;
 	 
       // I suppose this should prompt somehow?
diff --git a/methods/makefile b/methods/makefile
index 78bdbc96f..134166ba3 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 # FIXME..
-LIB_APT_PKG_MAJOR = 4.7
+LIB_APT_PKG_MAJOR = 4.8
 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method
@@ -40,7 +40,7 @@ include $(PROGRAM_H)
 
 # The cdrom method
 PROGRAM=cdrom
-SLIBS = -lapt-pkg $(INTLLIBS)
+SLIBS = -lapt-pkg -ldl $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile
 SOURCE = cdrom.cc
 include $(PROGRAM_H)
diff --git a/po/ChangeLog b/po/ChangeLog
index e71fb1447..8d5515e9d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,75 @@
+2009-06-05  Jordi Mallach  <jordi@debian.org>
+
+	* ca.po: Updated to 539t
+
+2009-06-04  Milo Casagrande  <milo@ubuntu.com>
+
+	* it.po: Updated to 539t
+
+2009-06-01  Deng Xiyue  <manphiz-guest@users.alioth.debian.org>
+
+	* zh_CN.po: Updated to 539t
+
+2009-05-21  Marcos  <marcos.alvarez.costales@gmail.com>
+
+	* ast.po: Updated to 539t
+
+2009-04-28  Ivan Masár  <helix84@centrum.sk>
+
+	* sk.po: Updated to 539t
+
+2009-04-23  Christian Perrier  <bubulle@debian.org>
+
+	* Update all PO files and apt-all.pot. 545 strings.
+	  Formerly complete PO files are now 539t1f6u
+	* fr.po: updated to 545t.
+
+2009-03-19  Ivan Masár  <helix84@centrum.sk>
+
+	* sk.po: Updated to 539t
+
+2009-03-04  Daniel Nylander  <po@danielnylander.se>
+
+	* sv.po: Updated to 539t
+
+2009-02-23  Christian Perrier  <bubulle@debian.org>
+
+	* Update all PO files and apt-all.pot. 539 strings.
+	  Formerly complete PO files are now 538t1u
+	* fr.po: updated to 539t.
+
+2009-02-01  Hans Fredrik Nordhaug  <hans@nordhaug.priv.no>
+
+	* nb.po: updated to 539t.
+
+2009-01-27  Damyan Ivanov  <dmn@debian.org>
+
+	* bg.po: updated to 539t.
+
+2008-12-11  Christian Perrier  <bubulle@debian.org>
+
+	* fr.po: fix spelling error to "défectueux"
+
+2009-01-04  Tetralet  <tetralet@gmail.com>
+
+	* zh_TW.po: Added as 538t1u.
+
+2008-12-22  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: updated to 539t.
+
+2008-12-22  Jordi Mallach  <jordi@debian.org>
+
+	* ca.po: updated to 539t.
+
+2008-12-19  Marcelino Villarino  <mvillarino@gmail.com>
+
+	* gl.po: updated to 539t.
+
+2008-12-12  Tapio Lehtonen  <tale@debian.org>
+
+	* fi.po: updated to 539t.
+
 2008-12-06  Christian Perrier  <bubulle@debian.org>
 
 	* fr.po: dropped awful use of first person
diff --git a/po/apt-all.pot b/po/apt-all.pot
index ae7cb4795..a18646290 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-22 16:56+0200\n"
+"POT-Creation-Date: 2009-07-26 01:10+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,83 +15,83 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1017
+#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1571
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1217
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
@@ -108,55 +108,50 @@ msgstr ""
 msgid "Package files:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1618
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr ""
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1545
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1557 cmdline/apt-cache.cc:1598
 msgid "(not found)"
 msgstr ""
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1578
 msgid "  Installed: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1580 cmdline/apt-cache.cc:1588
 msgid "(none)"
 msgstr ""
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1585
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1595
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1604
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1619
 #, c-format
 msgid "       %4i %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2571 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
@@ -184,8 +179,8 @@ msgid ""
 "   show - Show a readable record for the package\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages\n"
-"   dotty - Generate package graphs for GraphVis\n"
+"   pkgnames - List the names of all packages in the system\n"
+"   dotty - Generate package graphs for GraphViz\n"
 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"
@@ -200,15 +195,15 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:78
+#: cmdline/apt-cdrom.cc:77
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:93
+#: cmdline/apt-cdrom.cc:92
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:117
+#: cmdline/apt-cdrom.cc:114
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -251,7 +246,7 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
 #, c-format
 msgid "Unable to write to %s"
 msgstr ""
@@ -550,221 +545,221 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1659
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr ""
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr ""
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr ""
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:669
 msgid "Correcting dependencies..."
 msgstr ""
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:672
 msgid " failed."
 msgstr ""
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:675
 msgid "Unable to correct dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:678
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:680
 msgid " Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:684
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:687
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:712
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:716
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:723
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:725
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:883
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:784
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:795
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1990 cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2001 cmdline/apt-get.cc:2034
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2317
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2328
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:836
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:841
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:844
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:852
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2166
+#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2177
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:873
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:909
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:891
 msgid "Yes, do as I say!"
 msgstr ""
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:893
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -772,74 +767,74 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:899 cmdline/apt-get.cc:918
 msgid "Abort."
 msgstr ""
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:914
 msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1344
+#: cmdline/apt-get.cc:986 cmdline/apt-get.cc:2225 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1004
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2223
+#: cmdline/apt-get.cc:1005 cmdline/apt-get.cc:2234
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1011
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1015
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1020
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1021
 msgid "Aborting install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1065
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1083
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1094
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1106
 msgid " [Installed]"
 msgstr ""
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1111
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -847,111 +842,126 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1135
 msgid "However the following packages replace it:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1138
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1158
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1166
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1195
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1197
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1203
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1309
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1346
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1359
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1411
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1443
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1445
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1450
 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:1445 cmdline/apt-get.cc:1733
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << endl;
+#. }
+#.
+#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1743
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1457
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1476
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1531
 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1646 cmdline/apt-get.cc:1682
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1669
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1700
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1713
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1716
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1728
 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"
@@ -959,159 +969,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1728
-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:1736
+#: cmdline/apt-get.cc:1746
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1765
+#: cmdline/apt-get.cc:1775
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1864
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1855
+#: cmdline/apt-get.cc:1865
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1894
 msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:1886 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1897 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1891
+#: cmdline/apt-get.cc:1902
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:1958 cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1969 cmdline/apt-get.cc:1977
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2066
+#: cmdline/apt-get.cc:2077
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2107 cmdline/apt-get.cc:2346
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:2156
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2173
+#: cmdline/apt-get.cc:2184
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2179
+#: cmdline/apt-get.cc:2190
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2182
+#: cmdline/apt-get.cc:2193
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2199
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2219
+#: cmdline/apt-get.cc:2230
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2258
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2270
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2260
+#: cmdline/apt-get.cc:2271
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2288
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2307
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:2323
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2340
+#: cmdline/apt-get.cc:2351
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2360
+#: cmdline/apt-get.cc:2371
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2465
+#: cmdline/apt-get.cc:2476
 #, 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:2501
+#: cmdline/apt-get.cc:2512
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2526
+#: cmdline/apt-get.cc:2539
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2553
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2544
+#: cmdline/apt-get.cc:2557
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2589
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2630
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1127,7 +1130,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1155,6 +1158,14 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc:2797
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr ""
@@ -1370,9 +1381,11 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
-#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
+#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:163
+#: apt-pkg/sourcelist.cc:169 apt-pkg/sourcelist.cc:324 apt-pkg/acquire.cc:419
+#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
@@ -1402,9 +1415,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
 #. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
+#: apt-pkg/pkgcachegen.cc:961
 msgid "Reading package lists"
 msgstr ""
 
@@ -1504,31 +1517,31 @@ msgstr ""
 msgid "Unparsable control file"
 msgstr ""
 
-#: methods/cdrom.cc:114
+#: methods/cdrom.cc:200
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr ""
 
-#: methods/cdrom.cc:123
+#: methods/cdrom.cc:209
 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 ""
 
-#: methods/cdrom.cc:131
+#: methods/cdrom.cc:219
 msgid "Wrong CD-ROM"
 msgstr ""
 
-#: methods/cdrom.cc:166
+#: methods/cdrom.cc:245
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 
-#: methods/cdrom.cc:171
+#: methods/cdrom.cc:250
 msgid "Disk not found."
 msgstr ""
 
-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr ""
 
@@ -1597,7 +1610,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr ""
 
@@ -1609,7 +1622,7 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr ""
 
@@ -1663,7 +1676,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1747,38 +1760,38 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr ""
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1794,89 +1807,124 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1104
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:215
+msgid "Failed to truncate file"
+msgstr ""
+
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1121 methods/http.cc:1176
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1228
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:80
+#: apt-pkg/contrib/mmap.cc:76
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:85
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/mmap.cc:234
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
@@ -1891,42 +1939,42 @@ msgstr ""
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -1992,177 +2040,187 @@ msgstr ""
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/contrib/cdromutl.cc:195
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:147
+#: apt-pkg/contrib/fileutl.cc:149
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:170
+#: apt-pkg/contrib/fileutl.cc:172
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:174
+#: apt-pkg/contrib/fileutl.cc:176
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:442
+#: apt-pkg/contrib/fileutl.cc:444
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:452
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:455
+#: apt-pkg/contrib/fileutl.cc:457
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:457
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:501
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:557
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:587
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:662
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:668
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:192 apt-pkg/depcache.cc:196
 msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:220
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:226
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
@@ -2202,32 +2260,32 @@ msgstr ""
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:203
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:445
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:240
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:244
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:428
+#: apt-pkg/packagemanager.cc:426
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2240,46 +2298,46 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:248
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1106
+#: apt-pkg/algorithms.cc:1138
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1108
+#: apt-pkg/algorithms.cc:1140
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1370 apt-pkg/algorithms.cc:1372
+#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:827
+#: apt-pkg/acquire.cc:826
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:829
+#: apt-pkg/acquire.cc:828
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
@@ -2294,21 +2352,21 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:132
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:148
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:56
 #, c-format
 msgid "Unable to stat %s."
 msgstr ""
@@ -2325,109 +2383,110 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:347
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:369
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:377
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:72
+#: apt-pkg/pkgcachegen.cc:74
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:115
+#: apt-pkg/pkgcachegen.cc:117
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:130
+#: apt-pkg/pkgcachegen.cc:132
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:153
+#: apt-pkg/pkgcachegen.cc:166
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:178
+#: apt-pkg/pkgcachegen.cc:191
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:182
+#: apt-pkg/pkgcachegen.cc:195
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:226
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:217
+#: apt-pkg/pkgcachegen.cc:230
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:221
+#: apt-pkg/pkgcachegen.cc:234
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:245
+#: apt-pkg/pkgcachegen.cc:258
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:264
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:267
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:270
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:273
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:288
+#: apt-pkg/pkgcachegen.cc:301
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:314
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:307
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:678
+#: apt-pkg/pkgcachegen.cc:693
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:778
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
 msgid "IO Error saving source cache"
 msgstr ""
 
@@ -2436,218 +2495,258 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:401
+#: apt-pkg/acquire-item.cc:394
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
+#: apt-pkg/acquire-item.cc:644 apt-pkg/acquire-item.cc:1406
 msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1100
+#: apt-pkg/acquire-item.cc:1101
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1213
+#: apt-pkg/acquire-item.cc:1211
 #, 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:1272
+#: apt-pkg/acquire-item.cc:1270
 #, 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:1313
+#: apt-pkg/acquire-item.cc:1311
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1400
+#: apt-pkg/acquire-item.cc:1398
 msgid "Size mismatch"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:40
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:47
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:529
+#: apt-pkg/cdrom.cc:525
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
+#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
 msgid "Identifying.. "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:559
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:590
+#: apt-pkg/cdrom.cc:585
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:603
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:612
+#: apt-pkg/cdrom.cc:607
 msgid "Waiting for disc...\n"
 msgstr ""
 
 #. Mount the new CDROM
-#: apt-pkg/cdrom.cc:620
+#: apt-pkg/cdrom.cc:615
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:638
+#: apt-pkg/cdrom.cc:633
 msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:678
+#: apt-pkg/cdrom.cc:673
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
 "zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:715
+#: apt-pkg/cdrom.cc:684
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:710
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:739
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:755
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:764
+#: apt-pkg/cdrom.cc:759
 msgid "Copying package lists..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:790
+#: apt-pkg/cdrom.cc:785
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:799
+#: apt-pkg/cdrom.cc:794
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:832
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:834
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:837
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:840
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:486
+#: apt-pkg/deb/dpkgpm.cc:49
 #, c-format
-msgid "Directory '%s' missing"
+msgid "Installing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:569
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
-msgid "Preparing %s"
+msgid "Configuring %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:570
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
-msgid "Unpacking %s"
+msgid "Removing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:575
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
-msgid "Preparing to configure %s"
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
-msgid "Configuring %s"
+msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
-msgid "Processing triggers for %s"
+msgid "Preparing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
-msgid "Installed %s"
+msgid "Unpacking %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588
-#: apt-pkg/deb/dpkgpm.cc:589
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
-msgid "Preparing for removal of %s"
+msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
-msgid "Removing %s"
+msgid "Installed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:648
+#, c-format
+msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:592
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:597
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:598
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
-#. populate the "processing" map
-#: apt-pkg/deb/dpkgpm.cc:604
+#: apt-pkg/deb/dpkgpm.cc:820
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
 #, c-format
-msgid "Installing %s"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:607
+#: apt-pkg/deb/debsystem.cc:73
 #, c-format
-msgid "Triggering %s"
+msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:756
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
 msgstr ""
 
 #: methods/rred.cc:219
diff --git a/po/ar.po b/po/ar.po
index 22cb495cb..92f74b614 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -18,155 +18,150 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "أسماء الحزم الكلية :"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr " الحزم العادية:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "الحزمة الوهمية تماماً:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr " الحزمة الوهمية المفردة:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr " الحزم الوهمية المختلطة:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr " مفقودة:"
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "مجموع النسخ الفريدة:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "مجموع النسخ الفريدة:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "مجموع المعتمدات:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "مجموع المساحة المحسوب حسابها:"
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "يجب أن تعطي صيغة واحدة بالضبط"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "لم يُعثر على أية حزم"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "ملفات الحزم:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "الحزم المُدبّسة:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(غير موجود)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr " مُثبّت:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(لاشيء)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  مرشّح: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr " جدول النسخ:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -555,79 +550,79 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr "فشل تغيير اسم %s إلى %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "إلا أن %s مثبت"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "إلا أنه غير قابل للتثبيت"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "إلا أنها حزمة وهمية"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "إلا أنها غير مثبتة"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "إلا أنه لن يتم تثبيتها"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " أو"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "سيتم إزالة الحزم التالية:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "سيتم الإبقاء على الحزم التالية:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "ستتم ترقية الحزم التالية:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "سيتم تثبيط الحزم التالية:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "سيتم تغيير الحزم المبقاة التالية:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (بسبب %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -635,143 +630,143 @@ msgstr ""
 "تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
 "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu أعيد تثبيتها، "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu مثبطة، "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "تصحيح المعتمدات..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " فشل."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "لم يمكن تصحيح المعتمدات"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "لم يمكن تقليص مجموعة الترقية"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " تم"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "تم غض النظر عن تحذير المصادقة.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "تعذرت المصادقة على بعض الحزم"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم تنته عملية الترتيب"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "تعذر قَفْل دليل التنزيل"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "تعذرت قراءة قائمة المصادر."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "بحاجة إلى جلب %sب من الأرشيف.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "تعذر حساب المساحة الحرة في %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "ليس هناك مساحة كافية في %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "نعم، افعل ما أقوله!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -782,28 +777,28 @@ msgstr ""
 "كي تستمر اكتب العبارة '%s'\n"
 " ؟] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "إجهاض."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "هل تريد الاستمرار [Y/n]؟"
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "فشل إحضار %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "فشل تنزيل بعض الملفات"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -811,47 +806,47 @@ msgstr ""
 "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
 "fix-missing؟"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "تعذر تصحيح الحزم المفقودة."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "إجهاض التثبيت."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "الحزمة %s وهميّة وتوفّرها:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [مُثبّتة]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "يجب اختيار واحدة بالتحديد لتثبيتها."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -859,64 +854,69 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "الحزمة %s ليس لها مرشح تثبيت"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "لا يقبل الأمر update أية مُعطيات"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "تعذر قفل دليل القائمة"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -932,51 +932,51 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -984,152 +984,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "حزم معطوبة"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "الحزم المقترحة:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "الحزم المستحسنة:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "حساب الترقية..."
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "فشل"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "تمّ"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "تعذر العثور على مصدر الحزمة %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ليس هناك مساحة كافية في %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "إحضار المصدر %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "فشل إحضار بعض الأرشيفات."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "أمر فك الحزمة '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "أمر البناء '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, 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:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1145,7 +1145,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1173,6 +1173,14 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr ""
@@ -1391,9 +1399,9 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "تعذرت قراءة %s"
@@ -1622,7 +1630,7 @@ msgstr "انتهى وقت الاتصال"
 msgid "Server closed the connection"
 msgstr "أغلق الخادم الاتصال"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "خطأ في القراءة"
 
@@ -1634,7 +1642,7 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "خطأ في الكتابة"
 
@@ -1688,7 +1696,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1772,38 +1780,38 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "تعذر الاتصال بـ%s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1819,81 +1827,81 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "بانتظار الترويسات"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "سطر ترويسة سيء"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "خادم http له دعم مدى معطوب"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "نسق تاريخ مجهول"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "فشل التحديد"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "خطأ في الكتابة إلى ملف المُخرجات"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "خطأ في القراءة من الخادم"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "فشلت كتابة الملف %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
@@ -1906,11 +1914,38 @@ msgstr ""
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "تعذر العثور على التحديد %s"
@@ -1925,42 +1960,42 @@ msgstr "اختصار نوع مجهول: '%c'"
 msgid "Opening configuration file %s"
 msgstr "فتح ملف التهيئة %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -2027,7 +2062,7 @@ msgid "Unable to stat the mount point %s"
 msgstr ""
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
@@ -2061,144 +2096,153 @@ msgstr ""
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:457
 #, c-format
+msgid "Sub-process %s received signal %u."
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:460
+#, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "مشكلة في مزامنة الملف"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "يعتمد"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "يعتمد مسبقاً"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "يستحسن"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "يقترح"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "يعارض"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "يستبدل"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "يُلغي"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "مهم"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "مطلوب"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "قياسي"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "اختياري"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "إضافي"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 #, fuzzy
 msgid "Reading state information"
 msgstr "دمج المعلومات المتوفرة"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "فشل فتح %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "فشلت كتابة الملف %s"
@@ -2282,40 +2326,40 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
@@ -2330,17 +2374,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "نظام الحزم '%s' غير مدعوم"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2361,16 +2405,17 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
@@ -2509,6 +2554,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "الحجم غير متطابق"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to open DB file %s: %s"
+msgid "Unable to parse Release file %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2564,6 +2626,12 @@ msgid ""
 "zu signatures\n"
 msgstr ""
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2594,22 +2662,22 @@ msgstr "كتابة لائحة المصادر الجديدة\n"
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2619,12 +2687,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "تهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "إزالة %s"
@@ -2634,61 +2702,82 @@ msgstr "إزالة %s"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "تحضير %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "فتح %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "التحضير لتهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "خطأ في معالجة الدليل %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "التحضير لإزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "تم إزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "التحضير لإزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "تمت إزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "تعذر قفل دليل القائمة"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""
@@ -2697,6 +2786,13 @@ msgstr ""
 msgid "Connection closed prematurely"
 msgstr ""
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "خطأ في معالجة الدليل %s"
+
 #, fuzzy
 #~ msgid "Line %d too long (max %lu)"
 #~ msgstr "السطر %d طويل جداً (أقصاه %d)"
diff --git a/po/ast.po b/po/ast.po
new file mode 100644
index 000000000..0b54122bf
--- /dev/null
+++ b/po/ast.po
@@ -0,0 +1,2999 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: apt 0.7.18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-07-01 18:09+0100\n"
+"Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
+"com>\n"
+"Language-Team: Asturian <alministradores@softastur.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:141
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "El paquete %s versi�n %s nun cumple una dependencia:\n"
+
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nun pue alcontrase'l paquete %s"
+
+#: cmdline/apt-cache.cc:245
+msgid "Total package names: "
+msgstr "Total de nomes de paquetes: "
+
+#: cmdline/apt-cache.cc:285
+msgid "  Normal packages: "
+msgstr "  Paquetes normales: "
+
+#: cmdline/apt-cache.cc:286
+msgid "  Pure virtual packages: "
+msgstr "  Paquetes virtuales puros: "
+
+#: cmdline/apt-cache.cc:287
+msgid "  Single virtual packages: "
+msgstr "  Paquetes virtuales cenciellos: "
+
+#: cmdline/apt-cache.cc:288
+msgid "  Mixed virtual packages: "
+msgstr "  Paquetes virtuales amestaos: "
+
+#: cmdline/apt-cache.cc:289
+msgid "  Missing: "
+msgstr "  Falten: "
+
+#: cmdline/apt-cache.cc:291
+msgid "Total distinct versions: "
+msgstr "Versiones distintes en total: "
+
+#: cmdline/apt-cache.cc:293
+msgid "Total distinct descriptions: "
+msgstr "Descriciones distintes en total: "
+
+#: cmdline/apt-cache.cc:295
+msgid "Total dependencies: "
+msgstr "Dependencies totales: "
+
+#: cmdline/apt-cache.cc:298
+msgid "Total ver/file relations: "
+msgstr "Relaciones versi�n/ficheru en total: "
+
+#: cmdline/apt-cache.cc:300
+msgid "Total Desc/File relations: "
+msgstr "Relaciones descrici�n/ficheru en total: "
+
+#: cmdline/apt-cache.cc:302
+msgid "Total Provides mappings: "
+msgstr "Mapes de provisiones en total: "
+
+#: cmdline/apt-cache.cc:314
+msgid "Total globbed strings: "
+msgstr "Cadenes globalizaes en total: "
+
+#: cmdline/apt-cache.cc:328
+msgid "Total dependency version space: "
+msgstr "Espaciu de dependencies de versi�n en total: "
+
+#: cmdline/apt-cache.cc:333
+msgid "Total slack space: "
+msgstr "Espaciu ociosu en total: "
+
+#: cmdline/apt-cache.cc:341
+msgid "Total space accounted for: "
+msgstr "Informe del total d'espaciu: "
+
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "El ficheru de paquetes %s nun ta sincroniz�u."
+
+#: cmdline/apt-cache.cc:1297
+msgid "You must give exactly one pattern"
+msgstr "Has de dar exautamente un patr�n"
+
+#: cmdline/apt-cache.cc:1451
+msgid "No packages found"
+msgstr "Nun s'alcontraron paquetes"
+
+#: cmdline/apt-cache.cc:1528
+msgid "Package files:"
+msgstr "Ficheros de paquete:"
+
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"La cach� nun ta sincronizada, nun puede facese x-ref a un ficheru de paquete"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1549
+msgid "Pinned packages:"
+msgstr "Paquetes na chincheta:"
+
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+msgid "(not found)"
+msgstr "(nun s'alcontr�)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1582
+msgid "  Installed: "
+msgstr "  Instal�u: "
+
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
+msgid "(none)"
+msgstr "(deng�n)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1589
+msgid "  Candidate: "
+msgstr "  Candidatu: "
+
+#: cmdline/apt-cache.cc:1599
+msgid "  Package pin: "
+msgstr "  Chincheta de paquetes: "
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1608
+msgid "  Version table:"
+msgstr "  Tabla de versiones:"
+
+#: cmdline/apt-cache.cc:1623
+#, c-format
+msgid "       %4i %s\n"
+msgstr "       %4i %s\n"
+
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s compiled on %s %s\n"
+msgstr "%s %s pa %s compil�u en %s %s\n"
+
+#: cmdline/apt-cache.cc:1726
+msgid ""
+"Usage: apt-cache [options] command\n"
+"       apt-cache [options] add file1 [file2 ...]\n"
+"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+"   add - Add a package file to the source cache\n"
+"   gencaches - Build both the package and source cache\n"
+"   showpkg - Show some general information for a single package\n"
+"   showsrc - Show source records\n"
+"   stats - Show some basic statistics\n"
+"   dump - Show the entire file in a terse form\n"
+"   dumpavail - Print an available file to stdout\n"
+"   unmet - Show unmet dependencies\n"
+"   search - Search the package list for a regex pattern\n"
+"   show - Show a readable record for the package\n"
+"   depends - Show raw dependency information for a package\n"
+"   rdepends - Show reverse dependency information for a package\n"
+"   pkgnames - List the names of all packages in the system\n"
+"   dotty - Generate package graphs for GraphViz\n"
+"   xvcg - Generate package graphs for xvcg\n"
+"   policy - Show policy settings\n"
+"\n"
+"Options:\n"
+"  -h   This help text.\n"
+"  -p=? The package cache.\n"
+"  -s=? The source cache.\n"
+"  -q   Disable progress indicator.\n"
+"  -i   Show only important deps for the unmet command.\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"Usu: apt-cache [opciones] orde\n"
+"     apt-cache [opciones] add ficheru1 [ficheru2 ...]\n"
+"     apt-cache [opciones] showpkg paq1 [paq2 ...]\n"
+"     apt-cache [opciones] showsrc paq1 [paq2 ...]\n"
+"\n"
+"apt-cache ye una ferramienta de baxu nivel usada pa remanar\n"
+"ficheros de cach� binarios d'APT y consultar informaci�n d'ellos\n"
+"\n"
+"Ordes:\n"
+"   add - Amesta un ficheru de paquete a la cach� fonte\n"
+"   gencaches - Creal dambes cach�s, la de paquetes y la de fontes\n"
+"   showpkg - Amuesa algo d'informaci�n xeneral d'un s�lu paquete\n"
+"   showsrc - Amuesa los rexistros de fonte\n"
+"   stats - Amuesa dalgunes estad�stiques b�siques\n"
+"   dump - Amuesa'l ficheru ensembre en formatu tersu\n"
+"   dumpavail - Imprenta un ficheru disponible na salida est�ndar\n"
+"   unmet - Amuesa dependencies nun atop�es\n"
+"   search - Restola na llista de paquetes por el patr�n d'una espresi�n "
+"regular\n"
+"   show - Amuesa un rexistru lle�ble pal paquete\n"
+"   depends - Amuesa la informaci�n de dependencies en bruto d'un paquete\n"
+"   rdepends - Amuesa la informaci�n de dependencies inverses d'un paquete\n"
+"   pkgnames - Llista los nomes de tolos paquetes nel sistema\n"
+"   dotty - Xenera gr�fiques del paquete pa GraphViz\n"
+"   xvcg - Xenera gr�fiques del paquete pa xvcg\n"
+"   policy - Amuesa los axustes de les normes\n"
+"\n"
+"Opciones:\n"
+"  -h   Esti testu d'aida.\n"
+"  -p=? La cache de paquetes.\n"
+"  -s=? La cache de fontes.\n"
+"  -q   Desactiva l'indicador de progresu.\n"
+"  -i   Amuesa s�lo les dependencies importantes de la orde incumplida.\n"
+"  -c=? Lleer esti ficheru de configuraci�n\n"
+"  -o=? Conse�a una opci�n de configuraci�n arbitraria, ex -o dir::cache=/"
+"tmp\n"
+"Ver les p�xines del manual apt-cache(8) y apt.conf(5) pa m�s informaci�n.\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Da-y un nome a esti discu, como 'Debian 2.1r1 Discu 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Inxerta un discu nel pres�u y calca intro"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Repite'l procesu colos dem�s CDs del conxuntu."
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "Argumentos non empareyaos"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+"   shell - Shell mode\n"
+"   dump - Show the configuration\n"
+"\n"
+"Options:\n"
+"  -h   This help text.\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usu: apt-config [opciones] orde\n"
+"\n"
+"apt-config ye una ferramienta pa lleer el ficheru de configuraci�n d'APT.\n"
+"\n"
+"Ordes:\n"
+"   shell - Mou shell\n"
+"   dump - Amuesa la configuraci�n\n"
+"\n"
+"Opciones:\n"
+"  -h   Esti testu d'aida.\n"
+"  -c=? Llee esti ficheru de configuraci�n\n"
+"  -o=? Conse�a una opci�n de configuraci�n arbitraria, p. ex.\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s nun ye un paquete DEB v�lidu."
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
+"\n"
+"apt-extracttemplates ye un pres�u pa sacar informaci�n de\n"
+"configuraci�n y plant�es de paquetes de debian.\n"
+"\n"
+"Opciones:\n"
+"-h Esti testu d'aida.\n"
+"-t Define'l direutoriu temporal\n"
+"-c=? Llei esti ficheru de configuraci�n\n"
+"-o=? Afita una opci�n de configuraci�n arbitraria, p. ej. -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nun se pue escribir en %s"
+
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nun se pue alcontrar la versi�n de debconf. �Ta instal�u debconf?"
+
+#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+msgid "Package extension list is too long"
+msgstr "La llista d'estensi�n de paquetes ye demasiao llarga"
+
+#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
+#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
+#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Error al procesar el direutoriu %s"
+
+#: ftparchive/apt-ftparchive.cc:251
+msgid "Source extension list is too long"
+msgstr "La llista d'estensi�n de fontes ye demasiao llarga"
+
+#: ftparchive/apt-ftparchive.cc:368
+msgid "Error writing header to contents file"
+msgstr "Error al escribir la cabecera al ficheru de conten�os"
+
+#: ftparchive/apt-ftparchive.cc:398
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Error al procesar conten�os %s"
+
+#: ftparchive/apt-ftparchive.cc:553
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Uso: apt-ftparchive [escoyetes] orde\n"
+"Ordes: packages camin-binariu [ficheru-disv�os [prefixu-camin]]\n"
+"          sources camin-fonte [ficheru-disv�os [prefixu-camin]]\n"
+"          contents camin\n"
+"          release camin\n"
+"          generate config [grupos]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive xenera �ndices p'archivos de Debian. Sofita dellos\n"
+"estilos de xeneraci�n de reemplazos pa dpkg-scanpackages y\n"
+"dpkg-scansources, dende los automatiz�os dafechu a los funcionales .\n"
+"\n"
+"apt-ftparchive xenera ficheros Package d'un �rbol de .debs. El ficheru\n"
+"Package tien los conten�os de tolos campos de control de cada paquete,\n"
+"neto que la suma MD5 y el tama�u del ficheru. Puede usase un ficheru\n"
+"de disv�os pa forzar el valor de Priority y Section.\n"
+"\n"
+"De mou asemey�u, apt-ftparchive xenera ficheros Sources pa un �rbol\n"
+"de .dscs. Puede utilizase la opci�n --source-override pa conse�ar un\n"
+"ficheru de disv�u de fonte.\n"
+"\n"
+"Les ordes �packages� y �sources� han d'executase na raiz de l'�rbol.\n"
+"BinaryPath tien qu'apuntar a la base de la gueta recursiva, y el ficheru\n"
+"de disv�os tien que contener les marques de los disv�os. El prefixu de\n"
+"cam�n, si esiste, am�stase a los campos de nome de ficheru. Darr�u,\n"
+"un exemplu d'usu bas�u nos archivos de Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Escoyetes:\n"
+"  -h    Esti testu d'aida\n"
+"  --md5 Xenerar control MD5 \n"
+"  -s=?  Ficheru de disv�u de fontes\n"
+"  -q    Sele\n"
+"  -d=?  Seleiciona la base de datos de cach� opcional \n"
+"  --no-delink Activa'l mou de depuraci�n de desenllaces\n"
+"  --contents  Xenerar ficheru de conten�os de control\n"
+"  -c=?  Lleer esti ficheru de configuraci�n\n"
+"  -o=?  Afita una escoyeta de configuraci�n propia"
+
+#: ftparchive/apt-ftparchive.cc:759
+msgid "No selections matched"
+msgstr "Nun concas� denguna seleici�n"
+
+#: ftparchive/apt-ftparchive.cc:832
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'"
+
+#: ftparchive/cachedb.cc:43
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "La BD corrompiose, ficheru renom�u como %s.old"
+
+#: ftparchive/cachedb.cc:61
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "La DB ye antigua, tentando actualizar %s"
+
+#: ftparchive/cachedb.cc:72
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"El formatu de la base de datos nun ye v�lidu. Si anovaste dende una versi�n "
+"anterior d'apt, desanicia y recrea la base de datos."
+
+#: ftparchive/cachedb.cc:77
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
+
+#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
+#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Nun pudo lleese %s"
+
+#: ftparchive/cachedb.cc:238
+msgid "Archive has no control record"
+msgstr "L'archivu nun tien rexistru de control"
+
+#: ftparchive/cachedb.cc:444
+msgid "Unable to get a cursor"
+msgstr "Nun pudo algamase un cursor"
+
+#: ftparchive/writer.cc:76
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Nun pudo lleese'l direutoriu %s\n"
+
+#: ftparchive/writer.cc:81
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A: Nun pudo lleese %s\n"
+
+#: ftparchive/writer.cc:132
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:134
+msgid "W: "
+msgstr "A: "
+
+#: ftparchive/writer.cc:141
+msgid "E: Errors apply to file "
+msgstr "E: Errores aplicables al ficheru "
+
+#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Nun pudo resolvese %s"
+
+#: ftparchive/writer.cc:170
+msgid "Tree walking failed"
+msgstr "Fall�'l percorr�u pol �rbol"
+
+#: ftparchive/writer.cc:195
+#, c-format
+msgid "Failed to open %s"
+msgstr "Nun pudo abrise %s"
+
+#: ftparchive/writer.cc:254
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Desenllazar %s [%s]\n"
+
+#: ftparchive/writer.cc:262
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Nun pudo lleese l'enllaz %s"
+
+#: ftparchive/writer.cc:266
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Nun pudo desenllazase %s"
+
+#: ftparchive/writer.cc:273
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Fall� enllazar enllazr %s a %s"
+
+#: ftparchive/writer.cc:283
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Alcanzose'l ll�mite of %sB de desenllaz.\n"
+
+#: ftparchive/writer.cc:387
+msgid "Archive had no package field"
+msgstr "L'archivu nun tien el campu paquetes"
+
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nun tien la entrada saltos\n"
+
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  el curiador de %s ye %s y non %s\n"
+
+#: ftparchive/writer.cc:620
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nun tien la entrada saltos de fonte\n"
+
+#: ftparchive/writer.cc:624
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s tampoco nun tiene una entrada binaria de saltos\n"
+
+#: ftparchive/contents.cc:321
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Error internu, nun se pue atopar el miembru %s"
+
+#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nun pudo allugase memoria"
+
+#: ftparchive/override.cc:34 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nun pudo abrise %s"
+
+#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "Saltu mal form�u %s llinia %lu #1"
+
+#: ftparchive/override.cc:74 ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "Saltu mal form�u %s llinia %lu #2"
+
+#: ftparchive/override.cc:88 ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "Saltu mal form�u %s llinia %lu #3"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nun pudo lleese'l ficheru de saltos %s"
+
+#: ftparchive/multicompress.cc:72
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmu de compresi�n desconoc�u '%s'"
+
+#: ftparchive/multicompress.cc:102
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "La salida comprimida %s necesita un xuegu de compresi�n"
+
+#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Fall� criar un tubu IPC al soprocesu"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to create FILE*"
+msgstr "Nun pudo criase FICHERU*"
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to fork"
+msgstr "Nun pudo biforcase"
+
+#: ftparchive/multicompress.cc:212
+msgid "Compress child"
+msgstr "Comprimir f�u"
+
+#: ftparchive/multicompress.cc:235
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Error internu, nun pudo criase %s"
+
+#: ftparchive/multicompress.cc:286
+msgid "Failed to create subprocess IPC"
+msgstr "Nun pudo criase'l soprocesu IPC"
+
+#: ftparchive/multicompress.cc:321
+msgid "Failed to exec compressor "
+msgstr "Nun pudo executase'l compresor "
+
+#: ftparchive/multicompress.cc:360
+msgid "decompressor"
+msgstr "descompresor"
+
+#: ftparchive/multicompress.cc:403
+msgid "IO to subprocess/file failed"
+msgstr "Fallu na ES al soprocesu/ficheru"
+
+#: ftparchive/multicompress.cc:455
+msgid "Failed to read while computing MD5"
+msgstr "Nun pudo lleese al computar MD5"
+
+#: ftparchive/multicompress.cc:472
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema al desenllazar %s"
+
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nun pudo renomase %s como %s"
+
+#: cmdline/apt-get.cc:127
+msgid "Y"
+msgstr "S"
+
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error de compilaci�n d'espresi�n regular - %s"
+
+#: cmdline/apt-get.cc:244
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes nun cumplen dependencies:"
+
+#: cmdline/apt-get.cc:334
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s ta instal�u"
+
+#: cmdline/apt-get.cc:336
+#, c-format
+msgid "but %s is to be installed"
+msgstr "pero %s ta pa instalar"
+
+#: cmdline/apt-get.cc:343
+msgid "but it is not installable"
+msgstr "pero nun ye instalable"
+
+#: cmdline/apt-get.cc:345
+msgid "but it is a virtual package"
+msgstr "pero ye un paquete virtual"
+
+#: cmdline/apt-get.cc:348
+msgid "but it is not installed"
+msgstr "pero nun ta instal�u"
+
+#: cmdline/apt-get.cc:348
+msgid "but it is not going to be installed"
+msgstr "pero nun va instalase"
+
+#: cmdline/apt-get.cc:353
+msgid " or"
+msgstr " o"
+
+#: cmdline/apt-get.cc:382
+msgid "The following NEW packages will be installed:"
+msgstr "Van instalase los siguientes paquetes NUEVOS:"
+
+#: cmdline/apt-get.cc:408
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes van DESANICIASE:"
+
+#: cmdline/apt-get.cc:430
+msgid "The following packages have been kept back:"
+msgstr "Los siguientes paquetes tan reten�os:"
+
+#: cmdline/apt-get.cc:451
+msgid "The following packages will be upgraded:"
+msgstr "Los siguientes paquetes van actualizase:"
+
+#: cmdline/apt-get.cc:472
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Los siguientes paquetes van DESACTUALIZASE:"
+
+#: cmdline/apt-get.cc:492
+msgid "The following held packages will be changed:"
+msgstr "Van camudase los siguientes paquetes reten�os:"
+
+#: cmdline/apt-get.cc:545
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por %s) "
+
+#: cmdline/apt-get.cc:553
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
+"�Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
+
+#: cmdline/apt-get.cc:584
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualizaos, %lu nuevos instalaos, "
+
+#: cmdline/apt-get.cc:588
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalaos, "
+
+#: cmdline/apt-get.cc:590
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualizaos, "
+
+#: cmdline/apt-get.cc:592
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
+
+#: cmdline/apt-get.cc:596
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
+
+#: cmdline/apt-get.cc:670
+msgid "Correcting dependencies..."
+msgstr "Iguando dependencies..."
+
+#: cmdline/apt-get.cc:673
+msgid " failed."
+msgstr " fall�."
+
+#: cmdline/apt-get.cc:676
+msgid "Unable to correct dependencies"
+msgstr "Nun pudieron iguase les dependencies"
+
+#: cmdline/apt-get.cc:679
+msgid "Unable to minimize the upgrade set"
+msgstr "Nun pue amenorgase'l conxuntu d'actualizaci�n"
+
+#: cmdline/apt-get.cc:681
+msgid " Done"
+msgstr " Fecho"
+
+#: cmdline/apt-get.cc:685
+msgid "You might want to run `apt-get -f install' to correct these."
+msgstr "Habr�es d'executar `apt-get -f install' para igualo."
+
+#: cmdline/apt-get.cc:688
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencies incumpl�es. T�ntalo usando -f."
+
+#: cmdline/apt-get.cc:710
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISU: �Nun pudieron autenticase los siguientes paquetes!"
+
+#: cmdline/apt-get.cc:714
+msgid "Authentication warning overridden.\n"
+msgstr "Avisu d'autenticaci�n salt�u.\n"
+
+#: cmdline/apt-get.cc:721
+msgid "Install these packages without verification [y/N]? "
+msgstr "�Instalar esos paquetes ensin verificaci�n [s/N]? "
+
+#: cmdline/apt-get.cc:723
+msgid "Some packages could not be authenticated"
+msgstr "Dellos paquetes nun pudieron autenticase"
+
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Hai problemes y utilizose -y ensin --force-yes"
+
+#: cmdline/apt-get.cc:776
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Error internu, �InstallPackages llamose con paquetes fra�aos!"
+
+#: cmdline/apt-get.cc:785
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torg�u."
+
+#: cmdline/apt-get.cc:796
+msgid "Internal error, Ordering didn't finish"
+msgstr "Error internu, ordenar nun fin�"
+
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
+msgid "Unable to lock the download directory"
+msgstr "Nun pue bloquiase'l direutoriu de descarga"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
+#: apt-pkg/cachefile.cc:65
+msgid "The list of sources could not be read."
+msgstr "Nun pudo lleese la llista de fontes."
+
+#: cmdline/apt-get.cc:837
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr "Que raro.. Los tama�os nun concasen, escribe a apt@packages.debian.org"
+
+#: cmdline/apt-get.cc:842
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Hai que descargar %sB/%sB d'archivos.\n"
+
+#: cmdline/apt-get.cc:845
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Hai que descargar %sB d'archivos.\n"
+
+#: cmdline/apt-get.cc:850
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Tres d'esta operaci�n, van usase %sB d'espaciu de discu adicional.\n"
+
+#: cmdline/apt-get.cc:853
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Tres d'esta operaci�n, van lliberase %sB d'espaciu de discu.\n"
+
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Nun pue determinase l'espaciu llibre de %s"
+
+#: cmdline/apt-get.cc:874
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Nun tienes espaciu libre bastante en %s."
+
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Conse�ose Trivial Only pero �sta nun ye una operaci�n trivial."
+
+#: cmdline/apt-get.cc:892
+msgid "Yes, do as I say!"
+msgstr "S�, �facer lo que digo!"
+
+#: cmdline/apt-get.cc:894
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Tas a piques de facer daqu� potencialmente da�ible.\n"
+"Pa continuar escribe la frase '%s'\n"
+" ?] "
+
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
+msgid "Abort."
+msgstr "Encaboxar."
+
+#: cmdline/apt-get.cc:915
+msgid "Do you want to continue [Y/n]? "
+msgstr "�Quies continuar [S/n]? "
+
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Fall� algamar %s  %s\n"
+
+#: cmdline/apt-get.cc:1005
+msgid "Some files failed to download"
+msgstr "Dellos ficheros nun pudieron descargase"
+
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
+msgid "Download complete and in download only mode"
+msgstr "Descarga completa y en mou de s�lo descarga"
+
+#: cmdline/apt-get.cc:1012
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Nun pudieron algamase dellos archivos, �seique executando apt-get update o "
+"tentando --fix-missing?"
+
+#: cmdline/apt-get.cc:1016
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing y camb�u de mediu nun ta sofitao actualmente"
+
+#: cmdline/apt-get.cc:1021
+msgid "Unable to correct missing packages."
+msgstr "Nun pudieron iguase los paquetes que falten."
+
+#: cmdline/apt-get.cc:1022
+msgid "Aborting install."
+msgstr "Encaboxando la instalaci�n."
+
+#: cmdline/apt-get.cc:1056
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr "Nota, escoyendo %s nel llugar de %s\n"
+
+#: cmdline/apt-get.cc:1066
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Saltando %s, ya ta instalau y la actualizaci�n nun ta activada.\n"
+
+#: cmdline/apt-get.cc:1084
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
+
+#: cmdline/apt-get.cc:1095
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "El paquete %s ye un paquete virtual ufr�u por:\n"
+
+#: cmdline/apt-get.cc:1107
+msgid " [Installed]"
+msgstr " [Instal�u]"
+
+#: cmdline/apt-get.cc:1112
+msgid "You should explicitly select one to install."
+msgstr "Has d'escoyer espl�citamente unu pa instalar."
+
+#: cmdline/apt-get.cc:1117
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"El paquete %s nun ta disponible, otru paquete refierse a �l.\n"
+"Esto puede significar que falta el paquete, ta arrumb�u, o s�lo\n"
+"ta disponible dende otra fonte\n"
+
+#: cmdline/apt-get.cc:1136
+msgid "However the following packages replace it:"
+msgstr "Sicas�, los siguientes paquetes reemplacenlu:"
+
+#: cmdline/apt-get.cc:1139
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "El paquete %s nun tien candidatu pa instalaci�n"
+
+#: cmdline/apt-get.cc:1159
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "La reinstalaci�n de %s nun ye dable, nun pue descargase.\n"
+
+#: cmdline/apt-get.cc:1167
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s y� ta na versi�n m�s nueva.\n"
+
+#: cmdline/apt-get.cc:1196
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Nun s'alcontr� la distribuci�n '%s' pa '%s'"
+
+#: cmdline/apt-get.cc:1198
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Nun s'alcontr� la versi�n '%s' pa '%s'"
+
+#: cmdline/apt-get.cc:1204
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "Escoyida la versi�n %s (%s) pa %s\n"
+
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "Nenguna fonte de paquetes'% s' esbillada '% s' eh�\n"
+
+#: cmdline/apt-get.cc:1348
+msgid "The update command takes no arguments"
+msgstr "La orde update nun lleva argumentos"
+
+#: cmdline/apt-get.cc:1361
+msgid "Unable to lock the list directory"
+msgstr "Nun pudo bloquiase'l direutoriu de llista"
+
+#: cmdline/apt-get.cc:1413
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
+
+#: cmdline/apt-get.cc:1445
+msgid ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr ""
+"Los siguientes paquetes instalaronse de manera autom�tica y ya nun se "
+"necesiten:"
+
+#: cmdline/apt-get.cc:1447
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr "Usa 'apt-get autoremove' pa desinstalalos."
+
+#: cmdline/apt-get.cc:1452
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+"Hmm, paez que AutoRemover destruy� daqu�, lo que nun tendr�a\n"
+"por qu� pasar. Por favor, unv�a un informe de fallu escontra apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << endl;
+#. }
+#.
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
+msgid "The following information may help to resolve the situation:"
+msgstr "La siguiente informaci�n pue aidar a resolver la situaci�n:"
+
+#: cmdline/apt-get.cc:1459
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Error internu, AutoRemover rompi� coses"
+
+#: cmdline/apt-get.cc:1478
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "Error internu, AllUpgrade rompi� coses"
+
+#: cmdline/apt-get.cc:1533
+#, c-format
+msgid "Couldn't find task %s"
+msgstr "Nun pudo alcontrase la tarea %s"
+
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Nun pudo alcontrase'l paquete %s"
+
+#: cmdline/apt-get.cc:1671
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "Nota, escoyendo %s pa la espresi�n regular '%s'\n"
+
+#: cmdline/apt-get.cc:1702
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s axust�u como instal�u manualmente.\n"
+
+#: cmdline/apt-get.cc:1715
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "Habr�es d'executar `apt-get -f install' para iguar estos:"
+
+#: cmdline/apt-get.cc:1718
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
+"conse�a una soluci�n)."
+
+#: cmdline/apt-get.cc:1730
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Dellos paquetes nun pudieron instalase. Esto puede significar que\n"
+"conse�aste una situaci�n imposible o, si tas usando la distribuci�n\n"
+"inestable, que dellos paquetes necesarios nun se crearon o que\n"
+"s'allugaron fuera d'Incoming."
+
+#: cmdline/apt-get.cc:1748
+msgid "Broken packages"
+msgstr "Paquetes fra�aos"
+
+#: cmdline/apt-get.cc:1777
+msgid "The following extra packages will be installed:"
+msgstr "Instalar�nse los siguientes paquetes extra:"
+
+#: cmdline/apt-get.cc:1866
+msgid "Suggested packages:"
+msgstr "Paquetes afalaos:"
+
+#: cmdline/apt-get.cc:1867
+msgid "Recommended packages:"
+msgstr "Paquetes encamentaos"
+
+#: cmdline/apt-get.cc:1896
+msgid "Calculating upgrade... "
+msgstr "Calculando l'autualizaci�n... "
+
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
+msgid "Failed"
+msgstr "Fall�"
+
+#: cmdline/apt-get.cc:1904
+msgid "Done"
+msgstr "Fecho"
+
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Error internu, l'iguador de problemes fra�� coses"
+
+#: cmdline/apt-get.cc:2079
+msgid "Must specify at least one package to fetch source for"
+msgstr "Has de conse�ar polo menos un paquete p'algamar so fonte"
+
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Nun pudo alcontrase un paquete fonte pa %s"
+
+#: cmdline/apt-get.cc:2158
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Saltando'l ficheru y� descarg�u '%s'\n"
+
+#: cmdline/apt-get.cc:2186
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "Nun hai espaciu llibre bastante en %s"
+
+#: cmdline/apt-get.cc:2192
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
+
+#: cmdline/apt-get.cc:2195
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "Hai falta descargar %sB d'archivos fonte.\n"
+
+#: cmdline/apt-get.cc:2201
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Fonte descargada %s\n"
+
+#: cmdline/apt-get.cc:2232
+msgid "Failed to fetch some archives."
+msgstr "Fall� la descarga de dellos archivos."
+
+#: cmdline/apt-get.cc:2260
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Saltando'l desempaquet�u de la fonte y� desempaquetada en %s\n"
+
+#: cmdline/apt-get.cc:2272
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Fall� la orde de desempaquet�u '%s'.\n"
+
+#: cmdline/apt-get.cc:2273
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instal�u.\n"
+
+#: cmdline/apt-get.cc:2290
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Fall� la orde build '%s'.\n"
+
+#: cmdline/apt-get.cc:2309
+msgid "Child process failed"
+msgstr "Fall� el procesu f�u"
+
+#: cmdline/apt-get.cc:2325
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Hai que conse�ar polo menos un paquete pa verificar les dependencies de "
+"construcci�n"
+
+#: cmdline/apt-get.cc:2353
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Nun pudo algamase informaci�n de dependencies de construcci�n pa %s"
+
+#: cmdline/apt-get.cc:2373
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s nun tien dependencies de construcci�n.\n"
+
+#: cmdline/apt-get.cc:2425
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
+"paquete %s"
+
+#: cmdline/apt-get.cc:2478
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque denguna versi�n "
+"disponible del paquete %s satisfaz los requisitos de versi�n"
+
+#: cmdline/apt-get.cc:2514
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Nun se pudo satisfacer la dependencia %s pa %s: El paquete instal�u %s ye "
+"demasiao nuevu"
+
+#: cmdline/apt-get.cc:2541
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
+
+#: cmdline/apt-get.cc:2555
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Les dependencies de construcci�n de %s nun pudieron satisfacese."
+
+#: cmdline/apt-get.cc:2559
+msgid "Failed to process build dependencies"
+msgstr "Fallu al procesar les dependencies de construcci�n"
+
+#: cmdline/apt-get.cc:2591
+msgid "Supported modules:"
+msgstr "M�dulos sofitaos:"
+
+#: cmdline/apt-get.cc:2632
+msgid ""
+"Usage: apt-get [options] command\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+"   update - Retrieve new lists of packages\n"
+"   upgrade - Perform an upgrade\n"
+"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+"   remove - Remove packages\n"
+"   autoremove - Remove automatically all unused packages\n"
+"   purge - Remove packages and config files\n"
+"   source - Download source archives\n"
+"   build-dep - Configure build-dependencies for source packages\n"
+"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+"   dselect-upgrade - Follow dselect selections\n"
+"   clean - Erase downloaded archive files\n"
+"   autoclean - Erase old downloaded archive files\n"
+"   check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -d  Download only - do NOT install or unpack archives\n"
+"  -s  No-act. Perform ordering simulation\n"
+"  -y  Assume Yes to all queries and do not prompt\n"
+"  -f  Attempt to correct a system with broken dependencies in place\n"
+"  -m  Attempt to continue if archives are unlocatable\n"
+"  -u  Show a list of upgraded packages as well\n"
+"  -b  Build the source package after fetching it\n"
+"  -V  Show verbose version numbers\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+"Usu: apt-get [opciones] comandu\n"
+"       apt-get [opciones] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [opciones] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get ye una interface de ll�nia de comandos simple pa baxar ya\n"
+"instalar paquetes. L'usu m�s frecuente de comandos ye p'anovar\n"
+"ya instalar.\n"
+"\n"
+"Comandos:\n"
+"   update - Algamar nueva llista de paquetes\n"
+"   upgrade - Facer una anovaci�n\n"
+"   install - Instalar nuevos paquetes (pkg ye libc6 non libc6.deb)\n"
+"   remove - Desaniciar paquetes\n"
+"   autoremove - Desaniciar autom�ticamente tolos paquetes non usaos\n"
+"   purge - Quitar y desaniciar paquetes\n"
+"   source - Baxar fonte del archivu\n"
+"   build-dep - Configurar dependencies pa los paquetes fonte\n"
+"   dist-upgrade - Actualizaci�n de la distribuci�n, ver apt-get(8)\n"
+"   dselect-upgrade - Siguir seleiciones dselect\n"
+"   clean - Esborrar los ficheros de ficheros baxaos\n"
+"   autoclean - Esborrar ficheros de ficheros vieyos baxaos\n"
+"   check - Verificar que nun hai dependencies frayaes\n"
+"\n"
+"Opciones:\n"
+"  -h  Esti testu d'aida.\n"
+"  -q  Salida Log - ens�n indicaci�n de progresu\n"
+"  -qq Ens�n salida excepto pa fallos\n"
+"  -d  Baxar s�lo - NON instalar o desempaquetar los archivos\n"
+"  -s  Non aici�n. Facer una simulaci�n ordenada\n"
+"  -y  Asumir Yes pa toles entruges y nun visualizar la petici�n\n"
+"  -f  Intentar correxir un sistema con dependencies frayaes\n"
+"  -m  Intentar siguir si los archivos nun tan disponibles\n"
+"  -u  Amosar una lilsta de paquetes que tan bien\n"
+"  -b  Facer el paquete fonte dempues d'algamalu\n"
+"  -V  Amosar n�mberos de versiones\n"
+"  -c=? Lleer esti ficheru de configuraci�n\n"
+"  -o=? Afitar una opci�n de configuraci�n arbitraria, p. ex. -o dir::cache=/"
+"tmp\n"
+"Ver l�s p�xines de los manuales d' apt-get(8), sources.list(5) y apt.conf"
+"(5)\n"
+"pa m�s informaci�n y opciones.\n"
+"                       Esti APT tien Poderes de Super Vaca.\n"
+
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+"NOTA: �Esto s�lo ye una simulaci�n!\n"
+"       apt-get necesita privilexos de root pa la execuci�n real.\n"
+"       �Ten tami�n en cuenta que'l bloqu�u ta desactiv�u,\n"
+"       asina que nun dependen de la pertinencia de la verdadera situaci�n "
+"actual!"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "Oxe "
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "Des:"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "Ign "
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "Err "
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Descargaos %sB en %s (%sB/s)\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [Tresnando]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Cambeu de mediu: Por favor meti'l discu etiquet�u\n"
+" '%s'\n"
+"na unid� '%s' y calca Intro\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "�Rexistru de paquetes desconoc�u!"
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usu: apt-sortpkgs [opciones] ficheru1 [ficheru2 ...]\n"
+"\n"
+"apt-sortpkgs ye un pres�u cenciellu pa tresnar ficheros de paquetes.\n"
+"La opci�n -s �sase pa indicar qu� triba de ficheru ye.\n"
+"\n"
+"Opciones:\n"
+"-h   Esti testu d'aida.\n"
+"-s   Usa ordenamientu de ficheros fonte\n"
+"-c=? Llei esti ficheru de configuraci�n\n"
+"-o=? Afita una opci�n de configuraci�n arbitraria, p. ej. -o dir::\n"
+"cache=/tmp\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "�Mal axuste por omisi�n!"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45
+msgid "Press enter to continue."
+msgstr "Calca Intro pa continuar."
+
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr "�Quies desaniciar los ficheros .deb descargaos previamente?"
+
+#: dselect/install:101
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "Ocurrieron dellos errores al desempaquetar. Va configurarse'l"
+
+#: dselect/install:102
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "paquetes que s'instalaron. Esto pue causar errores duplicaos"
+
+#: dselect/install:103
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr ""
+"o fallos causaos por dependencies que nun t�n. Esto ta BIEN, s�lo los fallos"
+
+#: dselect/install:104
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"enriba d'esti mensaxe son importante. Por favor, �guales y executa [I]nstall "
+"otra vuelta"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "Fusionando informaci�n disponible"
+
+#: apt-inst/contrib/extracttar.cc:114
+msgid "Failed to create pipes"
+msgstr "Fallu al crear les tuber�es"
+
+#: apt-inst/contrib/extracttar.cc:141
+msgid "Failed to exec gzip "
+msgstr "Fallu al executar gzip "
+
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+msgid "Corrupted archive"
+msgstr "Ficheru toll�u"
+
+#: apt-inst/contrib/extracttar.cc:193
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Fall� la suma de control de tar, ficheru toll�u"
+
+#: apt-inst/contrib/extracttar.cc:296
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Testera  del TAR triba %u desconocida, miembru %s"
+
+#: apt-inst/contrib/arfile.cc:70
+msgid "Invalid archive signature"
+msgstr "Robla del ficheru inv�lida"
+
+#: apt-inst/contrib/arfile.cc:78
+msgid "Error reading archive member header"
+msgstr "Fallu al lleer la testera de miembru del ficheru"
+
+#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+msgid "Invalid archive member header"
+msgstr "Testera de miembur del ficheru inv�lida"
+
+#: apt-inst/contrib/arfile.cc:128
+msgid "Archive is too short"
+msgstr "El ficheru ye perpeque�u"
+
+#: apt-inst/contrib/arfile.cc:132
+msgid "Failed to read the archive headers"
+msgstr "Fall� al lleer les testeres del ficheru"
+
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Llam�se a DropNode nun nodu que ta ent� enllaz�u"
+
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "�Fallu al atopar l'elementu enllaz�u!"
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Fall� al allugar una desv�u"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Fallu internu en AddDiversion"
+
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Intentando sobrescribir un desv�u, %s -> %s and %s/%s"
+
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Doble suma de desv�u %s -> %s"
+
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ficheru de configuraci�n duplic�u %s/%s"
+
+#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Fall� la escritura nel ficheru %s"
+
+#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Fall� al pesllar el ficheru %s"
+
+#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#, c-format
+msgid "The path %s is too long"
+msgstr "La trayeutoria %s ye demasiao llarga"
+
+#: apt-inst/extract.cc:124
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Desempaquetando %s m�s d'una vegada"
+
+#: apt-inst/extract.cc:134
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "El direutorio %s ta desvi�u"
+
+#: apt-inst/extract.cc:144
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "El paquete ta tentando escribir nel oxetivu desvi�u %s/%s"
+
+#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+msgid "The diversion path is too long"
+msgstr "La trayeutoria de desviaci�n ye demasiao llarga"
+
+#: apt-inst/extract.cc:240
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "El direutoriu %s ta reemplaz�ndose por un non-direutoriu"
+
+#: apt-inst/extract.cc:280
+msgid "Failed to locate node in its hash bucket"
+msgstr "Fallu al atopar el nodu nel so bote d'enllaz"
+
+#: apt-inst/extract.cc:284
+msgid "The path is too long"
+msgstr "La trayeutoria ye perllarga"
+
+#: apt-inst/extract.cc:414
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Sobreescribiendo concordancia del paquete ensin versi�n pa %s"
+
+#: apt-inst/extract.cc:431
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
+
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
+#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
+#, c-format
+msgid "Unable to read %s"
+msgstr "Nun ye a lleer %s"
+
+#: apt-inst/extract.cc:491
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Nun ye a lleer %s"
+
+#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#, c-format
+msgid "Failed to remove %s"
+msgstr "Nun ye a desaniciar %s"
+
+#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#, c-format
+msgid "Unable to create %s"
+msgstr "Nun ye a crear %s"
+
+#: apt-inst/deb/dpkgdb.cc:114
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "Nun ye a lleer %s"
+
+#: apt-inst/deb/dpkgdb.cc:119
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr ""
+"Los direutorios info y temp tienen de tar nel mesmu sistema de ficheros"
+
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
+#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
+#: apt-pkg/pkgcachegen.cc:957
+msgid "Reading package lists"
+msgstr "Lleendo llista de paquetes"
+
+#: apt-inst/deb/dpkgdb.cc:176
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "Fallu al camudar al direutoriu d'alministraci�n %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
+#: apt-inst/deb/dpkgdb.cc:444
+msgid "Internal error getting a package name"
+msgstr "Fallu internu al obtener un Nome de Paquete"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+msgid "Reading file listing"
+msgstr "Lleendo llist�u de ficheros"
+
+#: apt-inst/deb/dpkgdb.cc:212
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"Nun pude abrir el ficheru de llista '%sinfo/%s'. �Si nun yes a restablecer "
+"esti ficheru ent�s crea �n baleru y darr�u reinstala la mesma versi�n del "
+"paquete!"
+
+#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "Fallu al lleer el ficheru de llista %sinfo/%s"
+
+#: apt-inst/deb/dpkgdb.cc:262
+msgid "Internal error getting a node"
+msgstr "Fallu internu al obtener un nodu"
+
+#: apt-inst/deb/dpkgdb.cc:305
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "Fallu al abrir el ficheru de desviaci�n %sdiversions"
+
+#: apt-inst/deb/dpkgdb.cc:320
+msgid "The diversion file is corrupted"
+msgstr "El ficheru de desviaci�n ta toll�u"
+
+#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
+#: apt-inst/deb/dpkgdb.cc:337
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "Llinia inv�lida nel ficheru de desviaci�n: %s"
+
+#: apt-inst/deb/dpkgdb.cc:358
+msgid "Internal error adding a diversion"
+msgstr "Fallu internu al amestar una desviaci�n"
+
+#: apt-inst/deb/dpkgdb.cc:379
+msgid "The pkg cache must be initialized first"
+msgstr "El cach� del paquete tien d'entamase primero"
+
+#: apt-inst/deb/dpkgdb.cc:439
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "Fallu al atopar un paquete: Testera, desplazamientu %lu"
+
+#: apt-inst/deb/dpkgdb.cc:461
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "Estaya mala del ConfFile nel ficheru d'est�au. Desplazamientu %lu"
+
+#: apt-inst/deb/dpkgdb.cc:466
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "Fallu al lleer Md5. Desplazamientu %lu"
+
+#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Esti nun ye un ficheru DEB v�lidu, falta'l miembru '%s'"
+
+#: apt-inst/deb/debfile.cc:50
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr "Esti nun ye un ficheru DEB v�lidu, falta'l miembru '%s', '%s' o '%s'"
+
+#: apt-inst/deb/debfile.cc:110
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "Nun fui a camudar a %s"
+
+#: apt-inst/deb/debfile.cc:140
+msgid "Internal error, could not locate member"
+msgstr "Fallu internu, nun fui a atopar el miembru"
+
+#: apt-inst/deb/debfile.cc:173
+msgid "Failed to locate a valid control file"
+msgstr "Nun fui a atopar un ficheru de control v�lidu"
+
+#: apt-inst/deb/debfile.cc:258
+msgid "Unparsable control file"
+msgstr "Ficheru de control inanalizable"
+
+#: methods/cdrom.cc:114
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Nun se pudo lleer la base datos %s del CD-ROM"
+
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Por favor usa apt-cdrom pa facer qu'APT reconoza esti CD. apt-get update nun "
+"se puede usar p'amestar CDs nuevos"
+
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
+msgstr "CD-ROM malu"
+
+#: methods/cdrom.cc:166
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "Nun se pudo desmontar el CD-ROM de %s; puede que se tea usando ent�."
+
+#: methods/cdrom.cc:171
+msgid "Disk not found."
+msgstr "Nun s'atopa'l discu."
+
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "Nun s'atopa'l ficheru."
+
+#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
+#: methods/rred.cc:234 methods/rred.cc:243
+msgid "Failed to stat"
+msgstr "Fall� al lleer"
+
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+msgid "Failed to set modification time"
+msgstr "Nun se pudo afitar la hora de modificaci�n"
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI malu, los URIS llocales nun pueden entamar por //"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "Entrando"
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "Nun se pudo determinar el nome del par"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "Nun se pudo determinar el nome llocal"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "El sirvidor refug� la conex�n, y dixo: %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "L'usuariu (USER) fall�; el sirvidor dixo: %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "La contrase�a (PASS) fall�; el sirvidor dixo: %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Especific�se un sirvidor proxy pero non un script d'entrada, Acquire::ftp::"
+"ProxyLogin ta baleru."
+
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Fall� la orde '%s' del gui�n d'entrada; el sirvidor dixo: %s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "La triba (TYPE) fall�; el sirvidor dixo: %s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "Gandi�'l tiempu de conex�n"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "El sirvidor zarr� la conex�n"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
+msgid "Read error"
+msgstr "Fallu de llectura"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "Una rempuesta revirti�'l buffer."
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "Corrupci�n del protocolu"
+
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
+msgid "Write error"
+msgstr "Fallu d'escritura"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "Nun se pudo crear un socket"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr "Nun se pudo coneutar el z�calu de datos; gandi�'l tiempu de conex�n"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
+msgstr "Nun se pudo coneutar un socket pasivu."
+
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo nun pudo obtener un z�calu oyente"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "Nun se pudo enllazar con un socket"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "Nun se pudo escuchar nel socket"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "Nun se pudo determinar el nome del socket"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "Nun se pudo mandar la orde PORT"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "Direici�n de familia %u desconocida (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "EPRT fall�; el sirvidor dixo: %s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "Gandi�'l tiempu de conex�n col z�calu de datos"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "Nun se pudo aceptar la conex�n"
+
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "Hebo un problema al xenerar el hash del ficheru"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "Gandi�'l tiempu del z�calu de datos"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Fall� la tresferencia de datos; el sirvidor dixo '%s'"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "Consulta"
+
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
+msgstr "Nun se pudo invocar "
+
+#: methods/connect.cc:70
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Coneutando a %s (%s)"
+
+#: methods/connect.cc:81
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc:90
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Nun se pudo crear un socket pa %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:96
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Nun se pudo coneutar a %s:%s (%s)."
+
+#: methods/connect.cc:104
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Nun se pudo coneutar a %s:%s (%s); expir�'l tiempu de conex�n"
+
+#: methods/connect.cc:119
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Nun se pudo coneutar a %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:147 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "Coneutando a %s"
+
+#: methods/connect.cc:165 methods/connect.cc:184
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Nun se pudo resolver '%s'"
+
+#: methods/connect.cc:190
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Fallu temporal al resolver '%s'"
+
+#: methods/connect.cc:193
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "Daqu� raru pas� resolviendo '%s:%s' (%i)"
+
+#: methods/connect.cc:240
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "Nun se pudo coneutar a %s %s:"
+
+#: methods/gpgv.cc:71
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nun se pudo acceder al aniellu de claves '%s'"
+
+#: methods/gpgv.cc:107
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+"E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando."
+
+#: methods/gpgv.cc:223
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+"Fallu internu: Robla bona, pero nun se pudo determinar la so g�ella dixital?!"
+
+#: methods/gpgv.cc:228
+msgid "At least one invalid signature was encountered."
+msgstr "Atop�se polo menos una robla mala."
+
+#: methods/gpgv.cc:232
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgstr "Nun se pudo executar '%s' pa verificar la robla (�ta instal�u gpgv?)"
+
+#: methods/gpgv.cc:237
+msgid "Unknown error executing gpgv"
+msgstr "Fallu desconoc�u al executar gpgv"
+
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
+msgid "The following signatures were invalid:\n"
+msgstr "Les siguientes robles nun valieron:\n"
+
+#: methods/gpgv.cc:285
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+"Les robles siguiente nun se pudieron verificar porque la to llave p�blica "
+"nun ta a mano:\n"
+
+#: methods/gzip.cc:64
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "Nun se pudo abrir una tuber�a pa %s"
+
+#: methods/gzip.cc:109
+#, c-format
+msgid "Read error from %s process"
+msgstr "Fallu de llectura dende'l procesu %s"
+
+#: methods/http.cc:379
+msgid "Waiting for headers"
+msgstr "Esperando les testeres"
+
+#: methods/http.cc:525
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Obt�vose una sola llinia de testera penriba de %u carauteres"
+
+#: methods/http.cc:533
+msgid "Bad header line"
+msgstr "Fallu na llinia testera"
+
+#: methods/http.cc:552 methods/http.cc:559
+msgid "The HTTP server sent an invalid reply header"
+msgstr "El sirvidor HTTP mand� una testera incorreuta de rempuesta"
+
+#: methods/http.cc:588
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "El sirvidor HTTP mand� una testera incorreuta de Content-Length"
+
+#: methods/http.cc:603
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "El sirvidor HTTP mand� una testera incorreuta de Content-Range"
+
+#: methods/http.cc:605
+msgid "This HTTP server has broken range support"
+msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
+
+#: methods/http.cc:629
+msgid "Unknown date format"
+msgstr "Formatu de data desconoc�u"
+
+#: methods/http.cc:782
+msgid "Select failed"
+msgstr "Fall� la escoyeta"
+
+#: methods/http.cc:787
+msgid "Connection timed out"
+msgstr "Gandi�'l tiempu de conex�n"
+
+#: methods/http.cc:810
+msgid "Error writing to output file"
+msgstr "Fallu al escribir nel ficheru de salida"
+
+#: methods/http.cc:841
+msgid "Error writing to file"
+msgstr "Fallu al escribir nel ficheru"
+
+#: methods/http.cc:869
+msgid "Error writing to the file"
+msgstr "Fallu al escribir nel ficheru"
+
+#: methods/http.cc:883
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Fallu al lleer nel sirvidor. El llau remotu zarr� la conex�n."
+
+#: methods/http.cc:885
+msgid "Error reading from server"
+msgstr "Fallu al lleer nel sirvidor"
+
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
+msgid "Failed to truncate file"
+msgstr "Fall� al francer el ficheru"
+
+#: methods/http.cc:1141
+msgid "Bad header data"
+msgstr "Datos de testera incorreutos"
+
+#: methods/http.cc:1158 methods/http.cc:1213
+msgid "Connection failed"
+msgstr "Fallo la conex�n"
+
+#: methods/http.cc:1305
+msgid "Internal error"
+msgstr "Fallu internu"
+
+#: apt-pkg/contrib/mmap.cc:80
+msgid "Can't mmap an empty file"
+msgstr "Nun se puede facer mmap d'un ficheru baleru"
+
+#: apt-pkg/contrib/mmap.cc:85
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nun se pudo facer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamic MMap escos� l'espaciu. Por favor aumenta'l tama�u de APT::Cache-"
+"Limit. El valor actual ye : %lu. (man 5 apt.conf)"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1029
+#, c-format
+msgid "Selection %s not found"
+msgstr "Escoyeta %s que nun s'atopa"
+
+#: apt-pkg/contrib/configuration.cc:439
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Triba d'abreviatura que nun se reconoz: �%c�"
+
+#: apt-pkg/contrib/configuration.cc:497
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Abriendo ficheros de configuraci�n %s"
+
+#: apt-pkg/contrib/configuration.cc:663
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque."
+
+#: apt-pkg/contrib/configuration.cc:682
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Fallu de sintaxis %s:%u: Marca mal formada"
+
+#: apt-pkg/contrib/configuration.cc:699
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempu�s del valor"
+
+#: apt-pkg/contrib/configuration.cc:739
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Error de sintaxis %s:%u: Les directives pueden facese s�lo nel nivel cimeru"
+
+#: apt-pkg/contrib/configuration.cc:746
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones a�eraes"
+
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equ�"
+
+#: apt-pkg/contrib/configuration.cc:759
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada"
+
+#: apt-pkg/contrib/configuration.cc:810
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru"
+
+#: apt-pkg/contrib/progress.cc:153
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... �Fallu!"
+
+#: apt-pkg/contrib/progress.cc:155
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Fecho"
+
+#: apt-pkg/contrib/cmndline.cc:77
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "La opci�n de llinia d'ordes '%c' [de %s] ye desconocida."
+
+#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
+#: apt-pkg/contrib/cmndline.cc:119
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Nun s'entiende la opci�n %s de la llinia d'ordes"
+
+#: apt-pkg/contrib/cmndline.cc:124
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "La opci�n %s de la llinia d'ordes nun ye un valor booleanu"
+
+#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "La opci�n %s necesita un argumentu."
+
+#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opci�n %s: L'axuste del elementu de configuraci�n ha tener un =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:234
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "La opci�n %s pide un argumentu enteru, non '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:265
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opci�n '%s' demasiao llarga"
+
+#: apt-pkg/contrib/cmndline.cc:298
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "El sent�u %s nun s'entiende, prueba con braeru o falsu."
+
+#: apt-pkg/contrib/cmndline.cc:348
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Operaci�n incorreuta: %s"
+
+#: apt-pkg/contrib/cdromutl.cc:52
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Nun puede algamase informaci�n del puntu de montaxe %s"
+
+#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Nun se pudo cambiar a %s"
+
+#: apt-pkg/contrib/cdromutl.cc:188
+msgid "Failed to stat the cdrom"
+msgstr "Nun se pudo montar el CD-ROM"
+
+#: apt-pkg/contrib/fileutl.cc:149
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Nun ta us�ndose bloqu�u pal ficheru de bloqu�u de s�lo llectura %s"
+
+#: apt-pkg/contrib/fileutl.cc:154
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Nun puede abrise'l ficheru de bloqu�u %s"
+
+#: apt-pkg/contrib/fileutl.cc:172
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Nun ta us�ndose bloqu�u pal ficheru de bloqu�u %s mont�u per nfs"
+
+#: apt-pkg/contrib/fileutl.cc:176
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Nun se pudo torgar %s"
+
+#: apt-pkg/contrib/fileutl.cc:444
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Esperaba %s pero nun taba ell�"
+
+#: apt-pkg/contrib/fileutl.cc:455
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "El subprocesu %s recibi� un fallu de segmentaci�n."
+
+#: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "El subprocesu %s recibi� un fallu de segmentaci�n."
+
+#: apt-pkg/contrib/fileutl.cc:460
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "El subprocesu %s devolvi� un c�digu d'error (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:462
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "El subprocesu %s termin� de manera inesperada"
+
+#: apt-pkg/contrib/fileutl.cc:506
+#, c-format
+msgid "Could not open file %s"
+msgstr "Nun se pudo abrir el ficheru %s"
+
+#: apt-pkg/contrib/fileutl.cc:562
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr "lle�os, ent� ten�a de lleer %lu pero nun queda nada"
+
+#: apt-pkg/contrib/fileutl.cc:592
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "escritos, ent� ten�a d'escribir %lu pero nun pudo facerse"
+
+#: apt-pkg/contrib/fileutl.cc:667
+msgid "Problem closing the file"
+msgstr "Problemes zarrando'l ficheru"
+
+#: apt-pkg/contrib/fileutl.cc:673
+msgid "Problem unlinking the file"
+msgstr "Hai problemes desvenceyando'l ficheru %s"
+
+#: apt-pkg/contrib/fileutl.cc:684
+msgid "Problem syncing the file"
+msgstr "Hai problemes al sincronizar el ficheru"
+
+#: apt-pkg/pkgcache.cc:133
+msgid "Empty package cache"
+msgstr "Cach� de paquetes balera."
+
+#: apt-pkg/pkgcache.cc:139
+msgid "The package cache file is corrupted"
+msgstr "El ficheru de cach� de paquetes ta toll�u"
+
+#: apt-pkg/pkgcache.cc:144
+msgid "The package cache file is an incompatible version"
+msgstr "El ficheru de cach� de paquetes ye una versi�n incompatible"
+
+#: apt-pkg/pkgcache.cc:149
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Esti APT nun soporta'l sistema de versiones '%s'"
+
+#: apt-pkg/pkgcache.cc:154
+msgid "The package cache was built for a different architecture"
+msgstr "La cach� de paquetes cre�se pa una arquitectura estremada"
+
+#: apt-pkg/pkgcache.cc:225
+msgid "Depends"
+msgstr "Depende de"
+
+#: apt-pkg/pkgcache.cc:225
+msgid "PreDepends"
+msgstr "Predepende de"
+
+#: apt-pkg/pkgcache.cc:225
+msgid "Suggests"
+msgstr "Suxer"
+
+#: apt-pkg/pkgcache.cc:226
+msgid "Recommends"
+msgstr "Recomienda"
+
+#: apt-pkg/pkgcache.cc:226
+msgid "Conflicts"
+msgstr "En conflictu con"
+
+#: apt-pkg/pkgcache.cc:226
+msgid "Replaces"
+msgstr "Sustituye a"
+
+#: apt-pkg/pkgcache.cc:227
+msgid "Obsoletes"
+msgstr "Fai obsoletu a"
+
+#: apt-pkg/pkgcache.cc:227
+msgid "Breaks"
+msgstr "Ruempe"
+
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr "Aumenta"
+
+#: apt-pkg/pkgcache.cc:238
+msgid "important"
+msgstr "importante"
+
+#: apt-pkg/pkgcache.cc:238
+msgid "required"
+msgstr "requer�u"
+
+#: apt-pkg/pkgcache.cc:238
+msgid "standard"
+msgstr "est�ndar"
+
+#: apt-pkg/pkgcache.cc:239
+msgid "optional"
+msgstr "opcional"
+
+#: apt-pkg/pkgcache.cc:239
+msgid "extra"
+msgstr "extra"
+
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+msgid "Building dependency tree"
+msgstr "Creando �rbol de dependencies"
+
+#: apt-pkg/depcache.cc:124
+msgid "Candidate versions"
+msgstr "Versiones candidates"
+
+#: apt-pkg/depcache.cc:153
+msgid "Dependency generation"
+msgstr "Xeneraci�n de dependencies"
+
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+msgid "Reading state information"
+msgstr "Lleendo informaci�n d'est�u"
+
+#: apt-pkg/depcache.cc:221
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nun se pudo abrir el ficheru d'est�u %s"
+
+#: apt-pkg/depcache.cc:227
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Fall� la escritura del ficheru temporal d'est�u %s"
+
+#: apt-pkg/tagfile.cc:102
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
+
+#: apt-pkg/tagfile.cc:189
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
+
+#: apt-pkg/sourcelist.cc:90
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinia %lu mal formada na llista d'or�xenes %s (URI)"
+
+#: apt-pkg/sourcelist.cc:92
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Llinia %lu mal formada na llista d'or�xenes %s (dist)"
+
+#: apt-pkg/sourcelist.cc:95
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Llinia %lu mal formada na llista d'or�xenes %s (anal�s d'URI)"
+
+#: apt-pkg/sourcelist.cc:101
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Llinia %lu mal formada na llista d'or�xenes %s (dist absoluta)"
+
+#: apt-pkg/sourcelist.cc:108
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Llinia %lu mal formada na llista d'or�xenes %s (anal�s de dist)"
+
+#: apt-pkg/sourcelist.cc:199
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinia %u demasiao llarga na llista d'or�genes %s."
+
+#: apt-pkg/sourcelist.cc:236
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinia %u mal formada na llista d'or�xenes %s (triba)"
+
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Triba '%s' desconocida na llinia %u de la llista d'or�xenes %s"
+
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "Llinia %u mal formada na llista d'or�xenes %s (id del proveedor)"
+
+#: apt-pkg/packagemanager.cc:428
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Esta execuci�n d'instalaci�n va requerir desaniciar temporalmente'l paquete "
+"esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye "
+"malo, pero si daveres quies facelo, activa la opci�n  APT::Force-LoopBreak."
+
+#: apt-pkg/pkgrecords.cc:32
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
+
+#: apt-pkg/algorithms.cc:248
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el."
+
+#: apt-pkg/algorithms.cc:1154
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Error, pkgProblemResolver::Resolve xener� fra�aures, esto puede ser pola mor "
+"de paquetes reten�os."
+
+#: apt-pkg/algorithms.cc:1156
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Nun pueden iguase los problemes; tienes paquetes fra�aos retenidos."
+
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Dellos ficheros d'indiz nun pudieron descargase; ignoraronse o usaronse los "
+"antiguos nel so llugar."
+
+#: apt-pkg/acquire.cc:60
+#, c-format
+msgid "Lists directory %spartial is missing."
+msgstr "Falta'l direutoriu de llistes %spartial."
+
+#: apt-pkg/acquire.cc:64
+#, c-format
+msgid "Archive directory %spartial is missing."
+msgstr "Falt'l direutoriu d'archivos %spartial."
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:829
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Descargando ficheru %li de %li (falten %s)"
+
+#: apt-pkg/acquire.cc:831
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Descargando ficheru %li de %li"
+
+#: apt-pkg/acquire-worker.cc:110
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Nun pudo alncontrase'l controlador de m�todu %s."
+
+#: apt-pkg/acquire-worker.cc:159
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El m�todu %s nun entam� correchamente"
+
+#: apt-pkg/acquire-worker.cc:413
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Por favor, introduz el discu '%s' nel pres�u '%s' y calca Intro."
+
+#: apt-pkg/init.cc:125
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "El sistema d'empaquet�u '%s' nun ta sofit�u"
+
+#: apt-pkg/init.cc:141
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Nun pudo determinase una triba de sistema d'empaquet�u afayadiza"
+
+#: apt-pkg/clean.cc:57
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nun pudo lleese %s."
+
+#: apt-pkg/srcrecords.cc:44
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
+
+#: apt-pkg/cachefile.cc:71
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"Nun pudieron analizase o abrise les llistes de paquetes o el ficheru d'est�u."
+
+#: apt-pkg/cachefile.cc:75
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Has d'executar apt-get update pa iguar estos problemes"
+
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"Rexistru inv�lidu nel ficheru de preferencies, nun hai cabecera Paquete"
+
+#: apt-pkg/policy.cc:351
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Nun s'entiende'l tipu de pin %s"
+
+#: apt-pkg/policy.cc:359
+msgid "No priority (or zero) specified for pin"
+msgstr "Nun hai priorid� (o ye cero) conse�ada pa pin"
+
+#: apt-pkg/pkgcachegen.cc:72
+msgid "Cache has an incompatible versioning system"
+msgstr "La cach� tien un sistema de versiones incompatible"
+
+#: apt-pkg/pkgcachegen.cc:115
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr "Hebo un error al procesar %s (NewPackage)"
+
+#: apt-pkg/pkgcachegen.cc:130
+#, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr "Hebo un error al procesar %s (UsePackage1)"
+
+#: apt-pkg/pkgcachegen.cc:164
+#, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr "Hebo un error al procesar %s (NewFileDesc1)"
+
+#: apt-pkg/pkgcachegen.cc:189
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr "Hebo un error al procesar %s (UsePackage2)"
+
+#: apt-pkg/pkgcachegen.cc:193
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr "Hebo un error al procesar %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:224
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr "Hebo un error al procesar %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:228
+#, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr "Hebo un error al procesar %s (UsePackage3)"
+
+#: apt-pkg/pkgcachegen.cc:232
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr "Hebo un error al procesar %s (NewVersion2)"
+
+#: apt-pkg/pkgcachegen.cc:256
+#, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr "Hebo un error al procesar %s (NewFileDesc2)"
+
+#: apt-pkg/pkgcachegen.cc:262
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Coime, perpasaste'l n�mberu de nomes de paquete qu'esti APT ye a remanar."
+
+#: apt-pkg/pkgcachegen.cc:265
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Vaya, perpasaste'l n�mberu de versiones coles que puede esti APT."
+
+#: apt-pkg/pkgcachegen.cc:268
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Coime, perpasaste'l n�mberu de descripciones qu'esti APT ye a remanar."
+
+#: apt-pkg/pkgcachegen.cc:271
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Vaya, perpasaste'l n�mberu de dependencies coles que puede esti APT."
+
+#: apt-pkg/pkgcachegen.cc:299
+#, c-format
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr "Hebo un error al procesar %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:312
+#, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr "Hebo un error al procesar %s (CollectFileProvides)"
+
+#: apt-pkg/pkgcachegen.cc:318
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Al procesar dependencies de ficheros nun s'alcontr� el paquete %s %s"
+
+#: apt-pkg/pkgcachegen.cc:690
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nun se puede lleer la llista de paquetes d'or�xenes %s"
+
+#: apt-pkg/pkgcachegen.cc:775
+msgid "Collecting File Provides"
+msgstr "Recoyendo ficheros qu'apurren"
+
+#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
+msgid "IO Error saving source cache"
+msgstr "Fallu de E/S al grabar cach� d'or�xenes"
+
+#: apt-pkg/acquire-item.cc:127
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "fall�'l cambiu de nome, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:401
+msgid "MD5Sum mismatch"
+msgstr "La suma MD5 nun concasa"
+
+#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
+msgid "Hash Sum mismatch"
+msgstr "La suma hash nun concasa"
+
+#: apt-pkg/acquire-item.cc:1118
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Nun hai clave p�blica denguna disponible pa les IDs de clave darr�u:\n"
+
+#: apt-pkg/acquire-item.cc:1231
+#, 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 ""
+"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
+"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
+
+#: apt-pkg/acquire-item.cc:1290
+#, 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 ""
+"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
+"necesites iguar manualmente esti paquete"
+
+#: apt-pkg/acquire-item.cc:1331
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Los ficheros d'indiz de paquetes tan corromp�os. Nun hai campu Filename: pal "
+"paquete %s."
+
+#: apt-pkg/acquire-item.cc:1418
+msgid "Size mismatch"
+msgstr "El tama�u nun concasa"
+
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Nota, escoyendo %s nel llugar de %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "El bloque de proveedor %s nun conti�n una buelga dixital"
+
+#: apt-pkg/cdrom.cc:529
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"Usando el puntu de montaxe de CD-ROM %s\n"
+"Montando el CD-ROM\n"
+
+#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
+msgid "Identifying.. "
+msgstr "Identificando.. "
+
+#: apt-pkg/cdrom.cc:563
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Etiqueta guardada: %s\n"
+
+#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+msgid "Unmounting CD-ROM...\n"
+msgstr "Desmontando l CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:590
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Usando el puntu de montaxe de CD-ROM %s\n"
+
+#: apt-pkg/cdrom.cc:608
+msgid "Unmounting CD-ROM\n"
+msgstr "Desmontando'l CD-ROM\n"
+
+#: apt-pkg/cdrom.cc:612
+msgid "Waiting for disc...\n"
+msgstr "Esperando'l discu...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:620
+msgid "Mounting CD-ROM...\n"
+msgstr "Montando'l CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:638
+msgid "Scanning disc for index files..\n"
+msgstr "Buscando nel discu ficheros d'�ndices...\n"
+
+#: apt-pkg/cdrom.cc:678
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"
+msgstr ""
+"Atop�u %zu indices de paquete, %zu indices de fonte, %zu indices de torna y %"
+"zu firmes\n"
+
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:715
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Atop�se la etiqueta: '%s'\n"
+
+#: apt-pkg/cdrom.cc:744
+msgid "That is not a valid name, try again.\n"
+msgstr "Esi nun ye un nome v�lidu; int�ntalo otra vuelta.\n"
+
+#: apt-pkg/cdrom.cc:760
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"Esti discu ll�mase: \n"
+"'%s'\n"
+
+#: apt-pkg/cdrom.cc:764
+msgid "Copying package lists..."
+msgstr "Copiando les llistes de paquetes..."
+
+#: apt-pkg/cdrom.cc:790
+msgid "Writing new source list\n"
+msgstr "Escribiendo llista nueva d'or�xenes\n"
+
+#: apt-pkg/cdrom.cc:799
+msgid "Source list entries for this disc are:\n"
+msgstr "Les entraes de la llista d'or�xenes pa esti discu son:\n"
+
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "%i rexistros escritos.\n"
+
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i rexistros escritos con %i ficheros de menos.\n"
+
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
+
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"Escribi�ronse %i rexistros con %i ficheros perd�os y %i ficheros que nun "
+"concasen\n"
+
+#: apt-pkg/deb/dpkgpm.cc:49
+#, c-format
+msgid "Installing %s"
+msgstr "Instalando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
+#, c-format
+msgid "Configuring %s"
+msgstr "Configurando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
+#, c-format
+msgid "Removing %s"
+msgstr "Desinstalando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:52
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Executando activador de post-instalaci�n de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:546
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Falta'l direutoriu '%s'."
+
+#: apt-pkg/deb/dpkgpm.cc:635
+#, c-format
+msgid "Preparing %s"
+msgstr "Preparando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:636
+#, c-format
+msgid "Unpacking %s"
+msgstr "Desempaquetando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:641
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Prepar�ndose pa configurar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:643
+#, c-format
+msgid "Installed %s"
+msgstr "%s instal�u"
+
+#: apt-pkg/deb/dpkgpm.cc:648
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Prepar�ndose pa desinstalar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:650
+#, c-format
+msgid "Removed %s"
+msgstr "%s desinstal�u"
+
+#: apt-pkg/deb/dpkgpm.cc:655
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Prepar�ndose pa desinstalar dafechu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:656
+#, c-format
+msgid "Completely removed %s"
+msgstr "Desinstal�se dafechu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:820
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+"Nun puede escribise nel rexistru, fall� openpty() (�/dev/pts nun ta "
+"mont�u?)\n"
+
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nun pudo bloquiase'l direutoriu de llista"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr "Non bloqui�u"
+
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Nun fui quien a parchiar el ficheru"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Conex�n encaboxada prematuramente"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Procesando disparadores pa %s"
diff --git a/po/bg.po b/po/bg.po
index d427249c0..455f8f7d6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,18 +1,16 @@
-# translation of apt_po_bg.po to Bulgarian
+# translation of apt-all.pot to Bulgarian
 # Bulgarian translation of apt.
 # Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the apt package.
 #
 # Yavor Doganov <yavor@doganov.org>, 2006.
-# Damyan Ivanov <dmn@debian.org>, 2008.
-# Damyan Ivanov <dam@modsoftsys.com>, 2008.
-# Damyan Ivanov <dmn@debiian.org>, 2008.
+# Damyan Ivanov <dmn@debian.org>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_bg\n"
+"Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-12 21:57+0200\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-01-27 12:41+0200\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,191 +19,149 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Пакетът %s не може да бъде намерен"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Общо имена на пакети : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Нормални пакети: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Чисти виртуални пакети: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Единични виртуални пакети: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Смесени виртуални пакети: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Липсващи: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Общо уникални версии: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Общо уникални описания: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Общо зависимости: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Общо отношения версия/файл: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Общо отношения описание/файл: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Общо отношения „Осигурява“: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Общо разгърнати низове: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Общо пространство за зависимости по версии: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Общо празно пространство: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Общо отчетено пространство: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Пакетният файл %s не е синхронизиран."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Трябва да въведете само един израз"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Няма намерени пакети"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Пакетни файлове:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Отбити пакети:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(не са намерени)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Инсталирана: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(няма)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Отбиване на пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Таблица с версиите:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s за %s компилиран на %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
-#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphVis\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -264,7 +220,7 @@ msgstr ""
 "   show - Показва запис за пакета\n"
 "   depends - Показва необработена информация за зависимости на пакета\n"
 "   rdepends - Показва информация за обратните зависимости на пакета\n"
-"   pkgnames - Списък с имената на всички пакети\n"
+"   pkgnames - Списък с имената на всички пакети, за които има информация\n"
 "   dotty - Генериране на графики на пакети за GraphVis\n"
 "   xvcg - Генериране на графики на пакети за xvcg\n"
 "   policy - Показване на настройките на политиката\n"
@@ -700,79 +656,79 @@ msgstr "Неуспех при премахването на връзка на %s
 msgid "Failed to rename %s to %s"
 msgstr "Неуспех при преименуването на %s на %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Грешка при компилирането на регулярния израз - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Следните пакети имат неудовлетворени зависимости:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "но е инсталиран %s"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "но ще бъде инсталиран %s"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "но той не може да бъде инсталиран"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "но той е виртуален пакет"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "но той не е инсталиран"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "но той няма да бъде инсталиран"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " или"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Следните пакети няма да бъдат променени:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Следните пакети ще бъдат актуализирани:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Следните задържани пакети ще бъдат променени:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (поради %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -780,148 +736,148 @@ msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
 "Това НЕ би трябвало да става освен ако знаете точно какво правите!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu актуализирани, %lu нови инсталирани, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu преинсталирани, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu върнати към по-стара версия, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu за премахване и %lu без промяна.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu не са напълно инсталирани или премахнати.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Коригиране на зависимостите..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " пропадна."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Неуспех при коригирането на зависимостите"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Неуспех при минимизирането на набора актуализации"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Готово"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 "Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
 "неизправности."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Инсталиране на тези пакети без проверка [y/N]?"
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Някои пакети не можаха да бъдат удостоверени"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Вътрешна грешка, „Ordering“ не завърши"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Неуспех при заключването на директорията за изтегляне"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Списъкът с източници не можа да бъде прочетен."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "След тази операция ще бъде използвано %sB допълнително дисково "
 "пространство.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Неуспех при определянето на свободното пространство в %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Нямате достатъчно свободно пространство в %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Указано е „Trivial Only“, но това не е тривиална операция."
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Да, прави каквото казвам!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -932,28 +888,28 @@ msgstr ""
 "За да продължите, въведете фразата „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Прекъсване."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Искате ли да продължите [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Неуспех при изтеглянето на %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Някои файлове не можаха да бъдат изтеглени"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Изтеглянето завърши в режим само на изтегляне"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -961,47 +917,47 @@ msgstr ""
 "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
 "или да опитате с „--fix-missing“?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Неуспех при коригирането на липсващите пакети."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Прекъсване на инсталирането."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Забележете, избиране на %s вместо %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Пакетът %s е виртуален пакет, осигурен от:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Инсталиран]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Трябва изрично да изберете един за инсталиране."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1012,64 +968,69 @@ msgstr ""
 "Това може да означава, че пакета липсва, остарял е, или е достъпен\n"
 "само от друг източник\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Обаче следните пакети го заместват:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Пакетът %s няма кандидат за инсталиране"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s вече е най-новата версия.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Не е намерено издание „%s“ на „%s“"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Не е намерена версия „%s“ на „%s“"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Избрана е версия %s (%s) за %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Командата „update“ не възприема аргументи"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Неуспех при заключването на директорията със списъка на пакетите"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Следните пакети са били инсталирани автоматично и вече не са необходими:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Използвайте „apt-get autoremove“ за да ги премахнете."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1087,44 +1048,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Следната информация може да помогне за намиране на изход от ситуацията:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Неуспех при намирането на задача %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Неуспех при намирането на пакет %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s е отбелязан като ръчно инсталиран.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1132,7 +1093,7 @@ msgstr ""
 "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
 "укажете разрешение)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1144,118 +1105,118 @@ msgstr ""
 "дистрибуция, че някои необходими пакети още не са създадени или пък\n"
 "са били преместени от Incoming."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Счупени пакети"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Предложени пакети:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Препоръчвани пакети:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Изчисляване на актуализацията..."
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Неуспех"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Готово"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неуспех при намирането на изходен код на пакет %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускане на вече изтегления файл „%s“\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Нямате достатъчно свободно пространство в %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Изтегляне на изходен код %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Неуспех при изтеглянето на някои архиви."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Командата за разпакетиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Командата за компилиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Процесът-потомък пропадна"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Неуспех при получаването на информация за зависимостите за компилиране на %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s няма зависимости за компилиране.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1264,7 +1225,7 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "не може да бъде намерен"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1274,32 +1235,33 @@ msgstr ""
 "налични версии на пакета %s, които могат да удовлетворят изискването за "
 "версия"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
 "пакет %s е твърде нов"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Неуспех при обработката на зависимостите за компилиране"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1315,7 +1277,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1385,6 +1347,14 @@ msgstr ""
 "информация и опции.\n"
 "                           Това APT има Върховни Сили.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Поп "
@@ -1615,9 +1585,9 @@ msgstr "Файловете се заменят със съдържанието �
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Файл %s/%s заменя този в пакет %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Неуспех при четенето на %s"
@@ -1850,7 +1820,7 @@ msgstr "Допустимото време за свързването изтеч
 msgid "Server closed the connection"
 msgstr "Сървърът разпадна връзката"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Грешка при четене"
 
@@ -1862,7 +1832,7 @@ msgstr "Отговорът препълни буфера."
 msgid "Protocol corruption"
 msgstr "Развален протокол"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Грешка при запис"
 
@@ -1918,7 +1888,7 @@ msgstr "Времето за установяване на връзка с гне
 msgid "Unable to accept connection"
 msgstr "Невъзможно е да се приеме свързването"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Проблем при хеширане на файла"
 
@@ -2002,44 +1972,44 @@ msgstr "Нещо лошо се случи при намирането на IP а
 msgid "Unable to connect to %s %s:"
 msgstr "Неуспех при свързването с %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Неуспех при достъпа до набор на ключове: „%s“"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване "
 "на работа."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
 "ключа?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Намерен е поне един невалиден подпис."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е "
 "gpgv?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестна грешка при изпълнението на gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Следните подписи са невалидни:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2057,80 +2027,80 @@ msgstr "Неуспех при отварянето на програмен ка�
 msgid "Read error from %s process"
 msgstr "Грешка при четене от процес %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Чакане на заглавни части"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Получен е един ред на заглавна част с над %u символа"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Невалиден ред на заглавна част"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Неизвестен формат на дата"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Неуспех на избора"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Допустимото време за свързване изтече"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Грешка при записа на изходен файл"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Грешка при записа на файл"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Грешка при записа на файла"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Грешка при четене от сървъра"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Неуспех при отрязване на края на файла"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Невалидни данни на заглавната част"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
@@ -2143,11 +2113,38 @@ msgstr "Невъзможно е да се прехвърли в паметта �
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Недостатъчен ресурс при налагане на файл в паметта"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Изборът %s не е намерен"
@@ -2162,44 +2159,44 @@ msgstr "Неизвестен тип на абревиатура: „%c“"
 msgid "Opening configuration file %s"
 msgstr "Отваряне на конфигурационен файл %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Синтактична грешка %s:%u: В началото на блока няма име."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Синтактична грешка %s:%u: Излишни символи след стойността"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното "
 "ниво"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
@@ -2266,7 +2263,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Неуспех при преминаването в %s"
@@ -2302,144 +2299,154 @@ msgstr "Неуспех при достъпа до заключване %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Изчака се завършването на %s, но той не беше пуснат"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Подпроцесът %s върна код за грешка (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Подпроцесът %s завърши неочаквано"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Неуспех при отварянето на файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 "грешка при четене, все още има %lu за четене, но няма нито един останал"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "грешка при запис, все още име %lu за запис, но не успя"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Проблем при затварянето на файла"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Проблем при премахването на връзка към файла"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Проблем при синхронизиране на файла"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Празен кеш на пакети"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Файлът за кеш на пакети е повреден"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Файлът за кеш на пакети е несъвместима версия"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Тази версия на APT не поддържа система за версии „%s“"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Кешът на пакети е бил направен за различна архитектура"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Зависи от"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Предварително зависи от"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Предлага се"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Препоръчва се"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Конфликтира с"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Заменя"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Изважда от употреба"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Чупи"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "важен"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "изискван"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "стандартен"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "незадължителен"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "допълнителен"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Изграждане на дървото със зависимости"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Версии кандидати"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Генериране на зависимости"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Четене на информацията за състоянието"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Неуспех при отварянето на StateFile %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Неуспех при запис на временен StateFile %s"
@@ -2533,7 +2540,7 @@ msgstr ""
 "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
 "него."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2541,12 +2548,12 @@ msgstr ""
 "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
 "причинено от задържани пакети."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Неуспех при коригирането на проблемите, имате задържани счупени пакети."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2554,24 +2561,24 @@ msgstr ""
 "Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или "
 "са използвани по-стари."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Директорията със списъци %spartial липсва."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Директорията за архиви %spartial липсва."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Изтегляне на файл %li от %li (остават %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Изтегляне на файл %li от %li"
@@ -2586,17 +2593,17 @@ msgstr "Неуспех при намирането на драйвер за ме
 msgid "Method %s did not start correctly"
 msgstr "Методът %s не стартира правилно"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Пакетната система „%s“ не е поддържана"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Неуспех при определянето на подходяща пакетна система"
 
@@ -2620,16 +2627,18 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Невалиден запис във файла с настройки, няма заглавна част Package"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Неизвестен тип за отбиване %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Няма указан приоритет (или е нула) на отбиването"
 
@@ -2777,6 +2786,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Несъответствие на размера"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Неуспех при анализирането на пакетен файл %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Забележете, избиране на %s вместо %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2835,6 +2861,12 @@ msgstr ""
 "Намерени са %zu индекса на пакети, %zu индекса на пакети с изходен код, %zu "
 "индекса с преводи и %zu подписа.\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2865,22 +2897,22 @@ msgstr "Запазване на новия списък с източници\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Записите в списъка с източници за този диск са:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Записани са %i записа.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Записани са %i записа с %i липсващи файла.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Записани са %i записа с %i несъответстващи файла\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
@@ -2890,12 +2922,12 @@ msgstr "Записани са %i записа с %i липсващи и %i не�
 msgid "Installing %s"
 msgstr "Инсталиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Конфигуриране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Премахване на %s"
@@ -2905,63 +2937,84 @@ msgstr "Премахване на %s"
 msgid "Running post-installation trigger %s"
 msgstr "Изпълнение на тригер след инсталиране %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Директорията „%s“ липсва"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготвяне на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Разпакетиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготвяне на %s за конфигуриране"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Обработка на тригерите на %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s е инсталиран"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготвяне за премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s е премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка за пълно премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s е напълно премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е "
 "монтирана?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Неуспех при заключването на директорията със списъка на пакетите"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Неуспех при закърпване на файла"
@@ -2970,11 +3023,11 @@ msgstr "Неуспех при закърпване на файла"
 msgid "Connection closed prematurely"
 msgstr "Връзката прекъсна преждевременно"
 
-#~ msgid ""
-#~ "Since you only requested a single operation it is extremely likely that\n"
-#~ "the package is simply not installable and a bug report against\n"
-#~ "that package should be filed."
-#~ msgstr ""
-#~ "Тъй като сте указали единична операция, твърде е възможно пакета просто\n"
-#~ "да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n"
-#~ "доклад за грешка за този пакет."
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Обработка на тригерите на %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Недостатъчен ресурс при налагане на файл в паметта"
diff --git a/po/bs.po b/po/bs.po
index 7073af346..28a02ed49 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+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,155 +14,150 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaći paket %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Nedostajući:"
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Paketi nisu pronađeni"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr ""
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr ""
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr ""
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -564,223 +559,223 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "ali je %s instaliran"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "ali se ne može instalirati"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "ali je virtuelni paket"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "ali nije instaliran"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "ali se neće instalirati"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " ili"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Slijedeći paketi će biti UKLONJENI:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Slijedeći paketi su zadržani:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Ispravljam zavisnosti..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr ""
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Ne mogu ispraviti zavisnosti"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Urađeno"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -788,75 +783,75 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Odustani."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Da li želite nastaviti? [Y/n]"
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr "[Instalirano]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -864,64 +859,69 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -937,49 +937,49 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -987,152 +987,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Računam nadogradnju..."
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Urađeno"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, 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:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1148,7 +1148,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1176,6 +1176,14 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr ""
@@ -1391,9 +1399,9 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu čitati %s"
@@ -1620,7 +1628,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
@@ -1633,7 +1641,7 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Greška pri pisanju"
 
@@ -1687,7 +1695,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1771,39 +1779,39 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1819,81 +1827,81 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Ne mogu ukloniti %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
@@ -1906,11 +1914,38 @@ msgstr ""
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
@@ -1925,42 +1960,42 @@ msgstr ""
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -2027,7 +2062,7 @@ msgid "Unable to stat the mount point %s"
 msgstr ""
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
@@ -2061,145 +2096,154 @@ msgstr ""
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:457
 #, c-format
+msgid "Sub-process %s received signal %u."
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:460
+#, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Zavisi"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Predlaže"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Preporučuje"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Zamjenjuje"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "važno"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "zahtijevano"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standardno"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opcionalno"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Verzije kandidata"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Stvaranje zavisnosti"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 #, fuzzy
 msgid "Reading state information"
 msgstr "Sastavljam dostupne informacije"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ne mogu ukloniti %s"
@@ -2283,40 +2327,40 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Čitam spisak datoteke"
@@ -2331,17 +2375,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2362,16 +2406,17 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
@@ -2509,6 +2554,21 @@ msgstr ""
 msgid "Size mismatch"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: apt-pkg/indexrecords.cc:47
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2565,6 +2625,12 @@ msgid ""
 "zu signatures\n"
 msgstr ""
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2594,22 +2660,22 @@ msgstr ""
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2619,12 +2685,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Povezujem se sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Otvaram %s"
@@ -2634,61 +2700,81 @@ msgstr "Otvaram %s"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Preporučuje"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 2a7108b31..c81f232cf 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,169 +1,164 @@
 # Catalan translation of APT.
-# Copyright © 2002, 2003, 2004, 2005, 2006, 2008 Software in the Public Interest, Inc.
+# Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009 Software in the Public Interest, Inc.
 # Antoni Bella Perez <bella5@teleline.es>, 2002, 2003.
 # Matt Bonner <mateubonet@yahoo.com>, 2003.
-# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006, 2008.
+# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006, 2008, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.7.19\n"
+"Project-Id-Version: apt 0.7.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-13 08:00+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-06-06 02:17+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@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:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "No s'ha trobat el paquet %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Nombre total de paquets: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Paquets normals: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Paquets virtuals purs: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuals únics: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuals mixtes: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Falten: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Total de versions diferents: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Total de descripcions diferents: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Total de dependències: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Total de relacions versió/fitxer: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Total de relacions descripció/fitxer: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Total dels mapes aportats: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Total de cadenes globals: "
 
-#: cmdline/apt-cache.cc:330
+#: 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:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Total de l'espai desperdiciat: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
-msgstr "Total de l'espai atribuit a: "
+msgstr "Total de l'espai atribuït a: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El fitxer %s del paquet està desincronitzat."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Heu de donar exactament un patró"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "No s'han trobat paquets"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Fitxers de paquets:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Paquets etiquetats:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(no trobat)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Instal·lat: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(cap)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Candidat: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Etiqueta del paquet: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Taula de versió:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per a %s compilat el %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -651,79 +646,79 @@ msgstr "S'ha trobat un problema treient l'enllaç %s"
 msgid "Failed to rename %s to %s"
 msgstr "No s'ha pogut canviar el nom de %s a %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, 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:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Els següents paquets tenen dependències sense satisfer:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "però està instal·lat %s"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "però s'instal·larà %s"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "però no és instal·lable"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "però és un paquet virtual"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "però no està instal·lat"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "però no serà instal·lat"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "S'instal·laran els paquets NOUS següents:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Es SUPRIMIRAN els paquets següents:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "S'han mantingut els paquets següents:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "S'actualitzaran els paquets següents:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Es DESACTUALITZARAN els paquets següents:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Es canviaran els paquets retinguts següents:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (per %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -731,148 +726,148 @@ msgstr ""
 "AVÍS: Es suprimiran els paquets essencials següents.\n"
 "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualitzats, %lu nous a instal·lar, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstal·lats, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualitzats, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a suprimir i %lu no actualitzats.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu no instal·lats o suprimits completament.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "S'estan corregint les dependències..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " ha fallat."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "No es poden corregir les dependències"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "No es pot minimitzar el joc de versions revisades"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Fet"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVÍS: No es poden autenticar els següents paquets!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "S'ha descartat l'avís d'autenticació.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "No s'ha pogut autenticar alguns paquets"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 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:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "No és possible blocar el directori de descàrrega"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "No s'ha pogut llegir la llista de les fonts."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Es necessita obtenir %sB/%sB d'arxius.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Es necessita obtenir %sB d'arxius.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Després d'aquesta operació s'empraran %sB d'espai en disc addicional.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, 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:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No teniu prou espai lliure en %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Sí, fes el que et dic!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -883,28 +878,28 @@ msgstr ""
 "Per a continuar escriviu la frase «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Avortat."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Voleu continuar [S/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "No s'ha pogut obtenir %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Descàrrega completa i en mode de només descàrrega"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -912,48 +907,48 @@ msgstr ""
 "No es poden baixar alguns arxius, proveu a executar apt-get update o "
 "intenteu-ho amb --fix-missing."
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i els medi intercanviables actualment no estan suportats"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "No es poden corregir els paquets que falten."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "S'està avortant la instal·lació."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, 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:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "El paquet %s no està instal·lat, així doncs no es suprimirà\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Instal·lat]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -964,66 +959,71 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Tot i que els següents paquets el reemplacen:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "El paquet %s no té candidat d'instal·lació"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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 baixar.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, 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:1193
+#: cmdline/apt-get.cc:1196
 #, 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:1195
+#: cmdline/apt-get.cc:1198
 #, 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:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versió seleccionada %s (%s) per a %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "No hi ha cap paquet font «%s», es selecciona «%s» en el seu lloc\n"
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "L'ordre update no pren arguments"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "No es pot blocar el directori de la llista"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
 "automàtic"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empreu «apt-get autoremove» per a suprimir-los."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1041,43 +1041,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error intern, AllUpgrade ha trencat coses"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "No s'ha pogut trobar la tasca %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "S'ha marcat %s com instal·lat manualment.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1085,7 +1085,7 @@ msgstr ""
 "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
 "especifiqueu una solució)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1097,120 +1097,120 @@ msgstr ""
 "unstable i alguns paquets requerits encara no han estat creats o bé\n"
 "encara no els hi han afegit."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "S'instal·laran els següents paquets extres:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "S'està calculant l'actualització... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Fet"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 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:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "Haureu d'especificar un paquet de codi font per a baixar"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, 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:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'està ometent el fitxer ja baixat «%s»\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No teniu prou espai lliure en %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es necessita baixar %sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obté el font %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no té dependències de construcció.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1219,7 +1219,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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1228,32 +1228,74 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
+#| msgid ""
+#| "Usage: apt-get [options] command\n"
+#| "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+#| "       apt-get [options] source pkg1 [pkg2 ...]\n"
+#| "\n"
+#| "apt-get is a simple command line interface for downloading and\n"
+#| "installing packages. The most frequently used commands are update\n"
+#| "and install.\n"
+#| "\n"
+#| "Commands:\n"
+#| "   update - Retrieve new lists of packages\n"
+#| "   upgrade - Perform an upgrade\n"
+#| "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+#| "   remove - Remove packages\n"
+#| "   autoremove - Remove automatically all unused packages\n"
+#| "   purge - Remove and purge packages\n"
+#| "   source - Download source archives\n"
+#| "   build-dep - Configure build-dependencies for source packages\n"
+#| "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+#| "   dselect-upgrade - Follow dselect selections\n"
+#| "   clean - Erase downloaded archive files\n"
+#| "   autoclean - Erase old downloaded archive files\n"
+#| "   check - Verify that there are no broken dependencies\n"
+#| "\n"
+#| "Options:\n"
+#| "  -h  This help text.\n"
+#| "  -q  Loggable output - no progress indicator\n"
+#| "  -qq No output except for errors\n"
+#| "  -d  Download only - do NOT install or unpack archives\n"
+#| "  -s  No-act. Perform ordering simulation\n"
+#| "  -y  Assume Yes to all queries and do not prompt\n"
+#| "  -f  Attempt to correct a system with broken dependencies in place\n"
+#| "  -m  Attempt to continue if archives are unlocatable\n"
+#| "  -u  Show a list of upgraded packages as well\n"
+#| "  -b  Build the source package after fetching it\n"
+#| "  -V  Show verbose version numbers\n"
+#| "  -c=? Read this configuration file\n"
+#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+#| "pages for more information and options.\n"
+#| "                       This APT has Super Cow Powers.\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1269,7 +1311,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1338,13 +1380,21 @@ msgstr ""
 "per a obtenir més informació i opcions.\n"
 "                       Aquest APT té superpoders bovins\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Obj "
 
 #: cmdline/acqprogress.cc:79
 msgid "Get:"
-msgstr "Des:"
+msgstr "Bai:"
 
 #: cmdline/acqprogress.cc:110
 msgid "Ign "
@@ -1399,7 +1449,7 @@ msgstr ""
 "\n"
 "Opcions:\n"
 "  -h   Aquest text d'ajuda.\n"
-"  -s   Emprar l'ordenació de fitxers font\n"
+"  -s   Empra l'ordenació de fitxers font\n"
 "  -c=? Llegeix aquest fitxer de configuració\n"
 "  -o=? Estableix una opció de configuració, p.ex: -o dir::cache=/tmp\n"
 
@@ -1414,7 +1464,7 @@ msgstr "Premeu Intro per a continuar."
 
 #: dselect/install:91
 msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "Voleu suprimir els paquets .deb baixats previament?"
+msgstr "Voleu suprimir els paquets .deb baixats prèviament?"
 
 #: dselect/install:101
 msgid "Some errors occurred while unpacking. I'm going to configure the"
@@ -1423,7 +1473,7 @@ msgstr "S'han produït alguns errors en desempaquetar. Es configuraran"
 #: dselect/install:102
 msgid "packages that were installed. This may result in duplicate errors"
 msgstr ""
-"els paquets que s'han instal·lat. Això pot resultar en errors duplicacats"
+"els paquets que s'han instal·lat. Això pot resultar en errors duplicats"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1469,7 +1519,7 @@ msgstr "Signatura de l'arxiu no vàlida"
 
 #: apt-inst/contrib/arfile.cc:78
 msgid "Error reading archive member header"
-msgstr "S'ha produït un rrror en llegir la capçalera del membre de l'arxiu"
+msgstr "S'ha produït un error en llegir la capçalera del membre de l'arxiu"
 
 #: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
 msgid "Invalid archive member header"
@@ -1571,9 +1621,9 @@ msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "No es pot llegir %s"
@@ -1614,7 +1664,7 @@ msgstr "S'està llegint la llista de paquets"
 #: apt-inst/deb/dpkgdb.cc:176
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
-msgstr "No s'ha pogut canviar al directori d'admininstració %sinfo"
+msgstr "No s'ha pogut canviar al directori d'administració %sinfo"
 
 #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
 #: apt-inst/deb/dpkgdb.cc:444
@@ -1807,7 +1857,7 @@ msgstr "Temps de connexió finalitzat"
 msgid "Server closed the connection"
 msgstr "El servidor ha tancat la connexió"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Error de lectura"
 
@@ -1817,9 +1867,9 @@ msgstr "Una resposta ha desbordat la memòria temporal."
 
 #: methods/ftp.cc:362 methods/ftp.cc:374
 msgid "Protocol corruption"
-msgstr "Protocol corrumput"
+msgstr "Protocol corromput"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Error d'escriptura"
 
@@ -1874,7 +1924,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexió"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
@@ -1958,44 +2008,44 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "No es pot connectar amb %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "No s'ha pogut accedir a l'anell de claus: «%s»"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 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:205
+#: methods/gpgv.cc:223
 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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "S'ha trobat almenys una signatura invàlida."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el "
 "gpgv?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "S'ha produït un error desconegut en executar el gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures següents són invàlides:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2013,81 +2063,81 @@ msgstr "No s'ha pogut obrir un conducte per a %s"
 msgid "Read error from %s process"
 msgstr "S'ha produït un error en llegir des del procés %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "S'estan esperant les capçaleres"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "S'ha obtingut una capçalera d'una sola línea de més de %u caràcters"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Línia de capçalera incorrecta"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 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:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Aquest servidor HTTP té el suport d'abast trencat"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Format de la data desconegut"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Ha fallat la selecció"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Connexió finalitzada"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "S'ha produït un error en escriure al fitxer de sortida"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "S'ha produït un error en llegir, el servidor remot ha tancat la connexió"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "No s'ha pogut truncar el fitxer %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Error intern"
 
@@ -2100,11 +2150,41 @@ msgstr "No es pot transferir un fitxer buit a memòria"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "L'MMap dinàmic s'ha quedat sense espai"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. "
+"Valor actual: %lu. (man 5 apt.conf)"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, fuzzy, c-format
+#| msgid "%limin %lis"
+msgid "%limin %lis"
+msgstr "limin %lis"
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "No s'ha trobat la selecció %s"
@@ -2119,42 +2199,42 @@ msgstr "Abreujament de tipus no reconegut: «%c»"
 msgid "Opening configuration file %s"
 msgstr "S'està obrint el fitxer de configuració %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Error sintàctic %s:%u: No comença el camp amb un nom."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Error sintàctic %s:%u: Etiqueta malformada"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Error sintàctic %s:%u Text extra després del valor"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "Error sintàctic %s:%u: Inclusió des d'aqui"
+msgstr "Error sintàctic %s:%u: Inclusió des d'aquí"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Error sintàctic %s:%u: Text extra al final del fitxer"
@@ -2221,7 +2301,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "No es pot obtenir informació del punt de muntatge %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "No es pot canviar a %s"
@@ -2239,7 +2319,7 @@ msgstr ""
 #: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Could not open lock file %s"
-msgstr "No es pot resoldre el fixter de blocat %s"
+msgstr "No es pot resoldre el fitxer de blocat %s"
 
 #: apt-pkg/contrib/fileutl.cc:172
 #, c-format
@@ -2256,143 +2336,153 @@ msgstr "No s'ha pogut blocar %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperava %s però no hi era"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Sub-procés %s ha rebut una violació de segment."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Sub-procés %s ha rebut una violació de segment."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Sub-procés %s ha retornat un codi d'error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El sub-procés %s ha sortit inesperadament"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "No s'ha pogut obrir el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "llegits, falten %lu per llegir, però no queda res"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escrits, falten %lu per escriure però no s'ha pogut"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Ha hagut un problema en tancar el fitxer"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Ha hagut un problema en desenllaçar el fitxer"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Ha hagut un problema en sincronitzar el fitxer"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Memòria cau de paquets és buida"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "El fitxer de memòria cau de paquets està corromput"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 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:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
-msgstr "Depén"
+msgstr "Depèn"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
-msgstr "Predepén"
+msgstr "Predepèn"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Suggereix"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Recomana"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Entra en conflicte"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Reemplaça"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Fa obsolet"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Trenca"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "requerit"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "estàndard"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "S'està construint l'arbre de dependències"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Versions candidates"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Dependències que genera"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "S'està llegint la informació de l'estat"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "No s'ha pogut obrir el fitxer d'estat %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
@@ -2481,7 +2571,7 @@ msgid ""
 msgstr ""
 "El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2489,13 +2579,13 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
 "causat per paquets retinguts."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "No es poden corregir els problemes, teniu paquets retinguts que estan "
 "trencats."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2503,24 +2593,24 @@ msgstr ""
 "No es poden baixar alguns fitxers índex, s'han ignorat o en el seu lloc "
 "s'han emprat els antics."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Falta el directori de llistes %spartial."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Falta el directori d'arxiu %spartial."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "S'està obtenint el fitxer %li de %li (falten %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "S'està obtenint el fitxer %li de %li"
@@ -2535,17 +2625,17 @@ msgstr "No s'ha pogut trobar el mètode de control %s."
 msgid "Method %s did not start correctly"
 msgstr "El mètode %s no s'ha iniciat correctament"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: 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."
 
@@ -2568,16 +2658,18 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Potser voldreu executar apt-get update per a corregir aquests problemes"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registre no vàlid al fitxer de preferències, paquet sense capçalera"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "No s'ha entès el pin de tipus %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "No hi ha prioritat especificada per al pin (o és zero)"
 
@@ -2730,6 +2822,21 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "La mida no concorda"
 
+#: apt-pkg/indexrecords.cc:40
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "No es pot analitzar el fitxer Release %s"
+
+#: apt-pkg/indexrecords.cc:47
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "No hi ha seccions al fitxer Release %s"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "No hi ha una entrada Hash al fitxer Release %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2788,6 +2895,12 @@ msgstr ""
 "S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de "
 "traduccions i %zu signatures\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2818,22 +2931,22 @@ msgstr "S'està escrivint una nova llista de fonts\n"
 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/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S'han escrit %i registres.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2845,12 +2958,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "S'està instal·lant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "S'està configurant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "S'està suprimint el paquet %s"
@@ -2858,65 +2971,86 @@ msgstr "S'està suprimint el paquet %s"
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Running post-installation trigger %s"
-msgstr "S'està executant el gallet de postinstal·lació %s"
+msgstr "S'està executant l'activador de postinstal·lació %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Manca el directori «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "S'està preparant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "S'està desempaquetant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "S'està preparant per a configurar el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "S'estan processant els gallets per al paquet %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "S'ha instal·lat el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "S'està preparant per a la supressió del paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "S'ha suprimit el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "S'està preparant per a suprimir completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "S'ha suprimit completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/"
 "pts?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "No es pot blocar el directori de la llista"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr "No blocat"
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "No s'ha pogut aplicar el pedaç al fitxer"
@@ -2925,6 +3059,21 @@ msgstr "No s'ha pogut aplicar el pedaç al fitxer"
 msgid "Connection closed prematurely"
 msgstr "La connexió s'ha tancat prematurament"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "S'estan processant els activadors per al paquet %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "L'MMap dinàmic s'ha quedat sense espai"
+
+#~ msgid "Release file expired, ignoring %s (valid until %s)"
+#~ msgstr "El fitxer Release ha caducat, s'està ignorant %s (vàlid fins a %s)"
+
+#~ msgid "Conflicting distribution: %s (expected %s but got %s)"
+#~ msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
+
 #~ 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"
diff --git a/po/cs.po b/po/cs.po
index 61df72d70..e87957b7d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-11-16 18:05+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -15,153 +15,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Balík %s verze %s má nesplněné závislosti:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nemohu najít balík %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Celkem názvů balíků: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Normálních balíků: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Čistě virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Smíšených virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Chybějících: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Celkem různých verzí: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Celkem různých popisů: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Celkem závislostí: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Celkem vztahů ver/soubor: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Celkem vztahů popis/soubor: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Celkem poskytnutých mapování: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Celkem globovaných řetězců: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Celkem místa závislých verzí: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Celkem jalového místa: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Celkem přiřazeného místa: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Soubor balíku %s je špatně synchronizovaný."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Musíte zadat právě jeden vzor"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Nebyly nalezeny žádné balíky"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Soubory balíku:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Vypíchnuté balíky:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(nenalezeno)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Instalovaná verze: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(žádná)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Vypíchnutý balík: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Tabulka verzí:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pro %s zkompilován na %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -646,79 +641,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba při kompilaci regulárního výrazu - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Následující balíky mají nesplněné závislosti:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "ale %s je nainstalován"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale %s se bude instalovat"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "ale nedá se nainstalovat"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "ale je to virtuální balík"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "ale není nainstalovaný"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "ale nebude se instalovat"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " nebo"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Následující NOVÉ balíky budou nainstalovány:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Následující balíky budou ODSTRANĚNY:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 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:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Následující balíky budou aktualizovány:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Následující balíky budou DEGRADOVÁNY:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Následující podržené balíky budou změněny:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (kvůli %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -726,144 +721,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizováno, %lu nově instalováno, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalováno, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradováno, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, 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:593
+#: cmdline/apt-get.cc:596
 #, 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:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Opravuji závislosti..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " selhalo."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Nemohu opravit závislosti"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Nemohu minimalizovat sadu pro aktualizaci"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Hotovo"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nesplněné závislosti. Zkuste použít -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 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:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Autentizační varování potlačeno.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalovat tyto balíky bez ověření [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Některé balíky nemohly být autentizovány"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 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:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Nemohu zamknout adresář pro stahování"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nelze přečíst seznam zdrojů."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Potřebuji stáhnout %sB/%sB archivů.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Potřebuji stáhnout %sB archivů.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po této operaci bude na disku použito dalších %sB.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po této operaci bude na disku uvolněno %sB.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nemohu určit volné místo v %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Ano, udělej to tak, jak říkám!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -874,28 +869,28 @@ msgstr ""
 "Pro pokračování opište frázi „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Přerušeno."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovat [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Selhalo stažení %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Některé soubory nemohly být staženy"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Stahování dokončeno v režimu pouze stáhnout"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -903,47 +898,47 @@ msgstr ""
 "Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
 "fix-missing?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Nemohu opravit chybějící balíky."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Přerušuji instalaci."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Pozn: Vybírám %s místo %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr "[Instalovaný]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Měli byste explicitně vybrat jeden k instalaci."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -954,64 +949,69 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Nicméně následující balíky jej nahrazují:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Balík %s nemá kandidáta pro instalaci"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s je již nejnovější verze.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Vybraná verze %s (%s) pro %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Příkaz update neakceptuje žádné argumenty"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Nemohu uzamknout list adresář"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Pro jejich odstranění použijte „apt-get autoremove“."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1029,43 +1029,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnitřní chyba, AutoRemover pokazil věci"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nemohu najít úlohu %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nemohu najít balík %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nastaven jako instalovaný ručně.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1073,7 +1073,7 @@ msgstr ""
 "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
 "navrhněte řešení)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1084,124 +1084,124 @@ 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:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Poškozené balíky"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Následující extra balíky budou instalovány:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Doporučované balíky:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Propočítávám aktualizaci... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nemohu najít zdrojový balík pro %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Přeskakuji dříve stažený soubor „%s“\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, 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:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stáhnout zdroj %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Stažení některých archivů selhalo."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Příkaz pro sestavení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Synovský proces selhal"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nemohu získat závislosti pro sestavení %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žádné závislosti pro sestavení.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, 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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1210,31 +1210,32 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Chyba při zpracování závislostí pro sestavení"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1250,7 +1251,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1317,6 +1318,14 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tato APT má schopnosti svaté krávy.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Cíl "
@@ -1545,9 +1554,9 @@ msgstr "Přepsat vyhovující balík bez udání verze pro %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Soubor %s/%s přepisuje ten z balíku %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nemohu číst %s"
@@ -1779,7 +1788,7 @@ msgstr "Čas spojení vypršel"
 msgid "Server closed the connection"
 msgstr "Server uzavřel spojení"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Chyba čtení"
 
@@ -1791,7 +1800,7 @@ msgstr "Odpověď přeplnila buffer."
 msgid "Protocol corruption"
 msgstr "Porušení protokolu"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Chyba zápisu"
 
@@ -1845,7 +1854,7 @@ msgstr "Spojení datového socketu vypršelo"
 msgid "Unable to accept connection"
 msgstr "Nemohu přijmout spojení"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problém s hashováním souboru"
 
@@ -1929,39 +1938,39 @@ msgstr "Něco hodně ošklivého se přihodilo při zjišťování „%s:%s“ (
 msgid "Unable to connect to %s %s:"
 msgstr "Nemohu se připojit k %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Nemohu přistoupit ke klíčence: „%s“"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 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:205
+#: methods/gpgv.cc:223
 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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nepodařilo se spustit „%s“ pro ověření podpisu (je gpgv nainstalováno?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Neznámá chyba při spouštění gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Následující podpisy jsou neplatné:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1979,80 +1988,80 @@ msgstr "Nemohu otevřít rouru pro %s"
 msgid "Read error from %s process"
 msgstr "Chyba čtení z procesu %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Čekám na hlavičky"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Chybná hlavička"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http server poslal neplatnou hlavičku odpovědi"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http server poslal neplatnou hlavičku Content-Length"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http server poslal neplatnou hlavičku Content-Range"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má porouchanou podporu rozsahů"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Neznámý formát data"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Výběr selhal"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Čas spojení vypršel"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Nelze zmenšit soubor"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
@@ -2065,11 +2074,38 @@ msgstr "Nemohu provést mmap prázdného souboru"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Nešlo mmapovat %lu bajtů"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamickému MMapu došlo místo"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Výběr %s nenalezen"
@@ -2084,43 +2120,43 @@ msgstr "Nerozpoznaná zkratka typu: „%c“"
 msgid "Opening configuration file %s"
 msgstr "Otevírám konfigurační soubor %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaktická chyba %s:%u: Zkomolená značka"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaktická chyba %s:%u: Příliš mnoho vnořených propojení (include)"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí"
@@ -2187,7 +2223,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Nelze vyhodnotit přípojný bod %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nemohu přejít do %s"
@@ -2221,143 +2257,153 @@ msgstr "Nemohu získat zámek %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Čekal jsem na %s, ale nebyl tam"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s obdržel chybu segmentace."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Podproces %s obdržel chybu segmentace."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s vrátil chybový kód (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s neočekávaně skončil"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nemohu otevřít soubor %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "zápis, stále mám %lu k zápisu, ale nejde to"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problém při zavírání souboru"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problém při odstraňování souboru"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problém při synchronizování souboru"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Cache balíků je prázdná"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Cache soubor balíků je poškozen"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Cache soubor balíků je v nekompatibilní verzi"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Tato APT nepodporuje systém pro správu verzí „%s“"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Cache balíků byla vytvořena pro jinou architekturu"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Závisí na"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Předzávisí na"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Doporučuje"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Nahrazuje"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Zastarává"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Porušuje"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "důležitý"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "vyžadovaný"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standardní"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "volitelný"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Vytvářím strom závislostí"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Kandidátské verze"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Generování závislostí"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Čtu stavové informace"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Nelze otevřít stavový soubor %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Nelze zapsat dočasný stavový soubor %s"
@@ -2444,7 +2490,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2452,11 +2498,11 @@ msgstr ""
 "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
 "podrženými balíky."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 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."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2464,24 +2510,24 @@ msgstr ""
 "Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou "
 "použity starší verze."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Adresář seznamů %spartial chybí."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Archivní adresář %spartial chybí."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Stahuji soubor %li z %li (%s zbývá)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Stahuji soubor %li z %li"
@@ -2496,17 +2542,17 @@ msgstr "Ovladač metody %s nemohl být nalezen."
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nebyla spuštěna správně"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte enter."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: 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"
 
@@ -2528,16 +2574,18 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Neplatný záznam v souboru preferencí, žádné záhlaví balíku"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nerozumím vypíchnutí typu %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
 
@@ -2680,6 +2728,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Velikosti nesouhlasí"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Nelze zpracovat soubor %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Pozn: Vybírám %s místo %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2738,6 +2803,12 @@ msgstr ""
 "Nalezl jsem indexy balíků (%zu), indexy zdrojů (%zu), indexy popisů (%zu) a "
 "podpisy (%zu)\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2768,22 +2839,22 @@ msgstr "Zapisuji nový seznam balíků\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Seznamy zdrojů na tomto disku jsou:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapsal jsem %i záznamů.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2794,12 +2865,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Instaluji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuji %s"
@@ -2809,61 +2880,82 @@ msgstr "Odstraňuji %s"
 msgid "Running post-installation trigger %s"
 msgstr "Spouštím poinstalační spouštěč %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresář „%s“ chybí"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Připravuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaluji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Připravuji nastavení %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Zpracovávám spouštěče pro %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Nainstalován %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Připravuji odstranění %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Připravuji úplné odstranění %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Kompletně odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nemohu uzamknout list adresář"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nemohu záplatovat soubor"
@@ -2872,6 +2964,15 @@ msgstr "Nemohu záplatovat soubor"
 msgid "Connection closed prematurely"
 msgstr "Spojení bylo předčasně ukončeno"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Zpracovávám spouštěče pro %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamickému MMapu došlo místo"
+
 #~ 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"
diff --git a/po/cy.po b/po/cy.po
index 441f24951..350e9c976 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+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,172 +14,167 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni ellir lleoli'r pecyn %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 #, fuzzy
 msgid "Total package names: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 #, fuzzy
 msgid "  Normal packages: "
 msgstr "  Pecynnau Normal: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "  Pure virtual packages: "
 msgstr "  Pecynnau Cwbl Rhithwir: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 #, fuzzy
 msgid "  Single virtual packages: "
 msgstr "  Pecynnau Rhithwir Sengl: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "  Mixed virtual packages: "
 msgstr "  Pecynnau Rhithwir Cymysg: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Ar Goll: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 #, fuzzy
 msgid "Total distinct versions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 #, fuzzy
 msgid "Total dependencies: "
 msgstr "Cyfanswm Dibyniaethau: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 #, fuzzy
 msgid "Total ver/file relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 #, fuzzy
 msgid "Total Provides mappings: "
 msgstr "Cyfanswm Mapiau Darpariath: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 #, fuzzy
 msgid "Total globbed strings: "
 msgstr "Cyfanswm Llinynau Glob: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 #, fuzzy
 msgid "Total dependency version space: "
 msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 #, fuzzy
 msgid "Total slack space: "
 msgstr "Cyfanswm gofod Slac: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total space accounted for: "
 msgstr "Cyfanswm Gofod Cyfrifwyd: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Canfuwyd dim pecyn"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 #, fuzzy
 msgid "Package files:"
 msgstr "Ffeiliau Pecynnau:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 #, fuzzy
 msgid "Pinned packages:"
 msgstr "Pecynnau wedi eu Pinio:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(heb ganfod)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Wedi Sefydlu: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(dim)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Ymgeisydd: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 #, fuzzy
 msgid "  Package pin: "
 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 #, fuzzy
 msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -676,82 +671,82 @@ msgstr "Gwall wrth datgysylltu %s"
 msgid "Failed to rename %s to %s"
 msgstr "Methwyd ailenwi %s at %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "I"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "ond mae %s wedi ei sefydlu"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "ond ni ellir ei sefydlu"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "ond mae'n becyn rhithwir"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "ond nid yw wedi ei sefydlu"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "ond nid yw'n mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " neu"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Caiff y pecynnau canlynol eu TYNNU:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 #, fuzzy
 msgid "The following packages will be upgraded:"
 msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 #, fuzzy
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (oherwydd %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -761,147 +756,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu wedi ailsefydlu, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu wedi eu israddio, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, 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:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Yn cywiro dibyniaethau..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " wedi methu."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Ni ellir cywiro dibyniaethau"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Ni ellir bychanu y set uwchraddio"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Wedi Gorffen"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 #, fuzzy
 msgid "Some packages could not be authenticated"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 #, 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:793
+#: cmdline/apt-get.cc:796
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Methwyd darllen y rhestr ffynhonellau."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Mae angen cyrchu %sB o archifau.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, 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:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -912,29 +907,29 @@ msgstr ""
 "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
 " ?]"
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Erthylu."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -942,49 +937,49 @@ msgstr ""
 "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
 "geidio defnyddio --fix-missing?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 #, fuzzy
 msgid "Aborting install."
 msgstr "Yn Erthylu'r Sefydliad."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Sefydliwyd]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Dylech ddewis un yn benodol i'w sefydlu."
 
 # FIXME: punctuation
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, fuzzy, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -996,64 +991,69 @@ msgstr ""
 "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
 "ffeil sources.list.\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1069,46 +1069,46 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 #, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1117,7 +1117,7 @@ msgstr ""
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1129,118 +1129,118 @@ msgstr ""
 "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
 "heb gael eu symud allan o Incoming."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 #, fuzzy
 msgid "Calculating upgrade... "
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Methwyd"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Wedi Gorffen"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, 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:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1249,7 +1249,7 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
 "s"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1258,34 +1258,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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1302,7 +1302,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1370,6 +1370,14 @@ msgstr ""
 "\n"
 "                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Presennol "
@@ -1607,9 +1615,9 @@ msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
@@ -1856,7 +1864,7 @@ msgstr "Goramser cysylltu"
 msgid "Server closed the connection"
 msgstr "Caeodd y gweinydd y cysylltiad"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Gwall darllen"
 
@@ -1868,7 +1876,7 @@ msgstr "Gorlifodd ateb y byffer."
 msgid "Protocol corruption"
 msgstr "Llygr protocol"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Gwall ysgrifennu"
 
@@ -1924,7 +1932,7 @@ msgstr "Goramserodd cysylltiad y soced data"
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
@@ -2009,39 +2017,39 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Methwyd cysylltu i %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Methwyd datrys '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2057,87 +2065,87 @@ msgstr "Methwyd agor pibell ar gyfer %s"
 msgid "Read error from %s process"
 msgstr "Gwall darllen o broses %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Yn aros am benawdau"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 #, fuzzy
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 #, fuzzy
 msgid "This HTTP server has broken range support"
 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Methwyd dewis"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 #, 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:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Methwyd ysgrifennu ffeil %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
@@ -2150,11 +2158,38 @@ msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Methwyd gwneud mmap() efo %lu beit"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Ni chanfuwyd y dewis %s"
@@ -2169,44 +2204,44 @@ msgstr "Talgryniad math anhysbys: '%c'"
 msgid "Opening configuration file %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
 
 # FIXME
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
@@ -2275,7 +2310,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ni ellir newid i %s"
@@ -2309,150 +2344,160 @@ msgstr "Methwyd cael y clo %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Arhoswyd am %s ond nid oedd e yna"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Derbyniodd is-broses %s wall segmentu."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Gorffenodd is-broses %s yn annisgwyl"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Methwyd agor ffeil %s"
 
 # FIXME
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "o hyd %lu i ddarllen ond dim ar ôl"
 
 # FIXME
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "o hyd %lu i ysgrifennu ond methwyd"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Gwall wrth gau'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Gwall wrth dadgysylltu'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Storfa pecyn gwag"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Mae'r ffeil storfa pecyn yn llygredig"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
 
 # FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Dibynnu"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "CynDdibynnu"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Awgrymu"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Argymell"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Gwrthdaro"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Amnewid"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Darfodi"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "pwysig"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "angenrheidiol"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "safonnol"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opsiynnol"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "ychwanegol"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 #, fuzzy
 msgid "Building dependency tree"
 msgstr "Yn Aideladu Coeden Dibyniaeth"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 #, fuzzy
 msgid "Candidate versions"
 msgstr "Fersiynau Posib"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 #, fuzzy
 msgid "Dependency generation"
 msgstr "Cynhyrchaid Dibyniaeth"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 #, fuzzy
 msgid "Reading state information"
 msgstr "Yn cyfuno manylion Ar Gael"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Methwyd agor %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Methwyd ysgrifennu ffeil %s"
@@ -2544,7 +2589,7 @@ msgstr ""
 "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
 "ei gyfer."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2552,12 +2597,12 @@ msgstr ""
 "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
 "ei achosi gan pecynnau wedi eu dal."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2565,24 +2610,24 @@ msgstr ""
 "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
 "rai eu defnyddio yn lle."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Yn Darllen Rhestr Ffeiliau"
@@ -2597,7 +2642,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s."
 msgid "Method %s did not start correctly"
 msgstr "Ni gychwynodd y dull %s yn gywir"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
@@ -2605,12 +2650,12 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: apt-pkg/init.cc:141
 #, fuzzy
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni ellir canfod math system addas"
@@ -2634,17 +2679,19 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
 
 # FIXME: literal
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
 
 # FIXME: tense
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Methwyd daeall y math pin %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
 
@@ -2792,6 +2839,24 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2848,6 +2913,12 @@ msgid ""
 "zu signatures\n"
 msgstr ""
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2878,22 +2949,22 @@ msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2903,12 +2974,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Yn cysylltu i %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Yn agor %s"
@@ -2918,61 +2989,82 @@ msgstr "Yn agor %s"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
@@ -2982,6 +3074,13 @@ msgstr "Methwyd agor ffeil %s"
 msgid "Connection closed prematurely"
 msgstr "Caewyd y cysylltiad yn gynnar"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+
 # FIXME: commas, wrapping
 #~ msgid ""
 #~ "Since you only requested a single operation it is extremely likely that\n"
diff --git a/po/da.po b/po/da.po
index cb07fcbe7..7532c7f81 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2007-09-06 21:40+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -19,192 +19,151 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kunne ikke lokalisere pakken %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Totale pakkenavne : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Normale pakker: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Rene virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Enkelte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Blandede virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Manglende: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Totale forskellige versioner: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Sammenlagt forskellige beskrivelser: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Sammenlagt afh�ngigheder: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Sammenlagt version/fil-relationer: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Sammenlagt version/fil-relationer: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Sammenlagt 'Tilbyder'-markeringer: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Totalle s�gem�nsterstrenge: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Total afh�ngighedsversions-plads: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Total 'Slack'-plads: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Total plads, der kan g�res rede for: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefilen %s er ude af trit."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Du skal angive n�jagtig �t m�nster"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Fandt ingen pakker"
 
 # Overskriften til apt-cache policy,
 # forkorter "Package" v�k. CH
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "'Pinned' pakker:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(ikke fundet)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Installeret: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(ingen)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Pakke-pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Versionstabel:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s oversat %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -691,79 +650,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fejl ved tolkning af regul�rt udtryk - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "F�lgende pakker har uopfyldte afh�ngigheder:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installeret"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s forventes installeret"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "men den kan ikke installeres"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "men det er en virtuel pakke"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "men den er ikke installeret"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "men den bliver ikke installeret"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "F�lgende NYE pakker vil blive installeret:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "F�lgende pakker vil blive AFINSTALLERET:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "F�lgende pakker er blevet holdt tilbage:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "F�lgende pakker vil blive opgraderet:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "F�lgende pakker vil blive NEDGRADERET:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "F�lgende tilbageholdte pakker vil blive �ndret:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (grundet %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -771,143 +730,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu opgraderes, %lu nyinstalleres, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu geninstalleres, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderes, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikke fuldst�ndigt installerede eller afinstallerede.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Retter afh�ngigheder..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " mislykkedes."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Kunne ikke rette afh�ngigheder"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Kunne ikke minimere opgraderingss�ttet"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " F�rdig"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Uopfyldte afh�ngigheder. Pr�v med -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: F�lgende pakkers autenticitet kunne ikke verificeres!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Autentifikationsadvarsel tilsidesat.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Install�r disse pakker uden verifikation (y/N)? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Nogle pakker kunne ikke autentificeres"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern fejl. InstallPackages blev kaldt med �delagte pakker!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern fejl. Sortering blev ikke fuldf�rt"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke l�se nedhentningsmappen"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Listen med kilder kunne ikke l�ses."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%sB/%sB skal hentes fra arkiverne.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%sB skal hentes fra arkiverne.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Efter udpakning vil %sB yderligere diskplads v�re brugt.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunne ikke bestemme ledig plads i %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Ja, g�r som jeg siger!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -918,28 +877,28 @@ msgstr ""
 "For at forts�tte, skal du skrive '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Afbryder."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du forts�tte [J/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Kunne ikke hente %s %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Nedhentningen af filer mislykkedes"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -947,49 +906,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:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing og medieskift underst�ttes endnu ikke"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Kunne ikke rette manglende pakker."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Afbryder installationen."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Bem�rk, at %s v�lges fremfor %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Installeret]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Du b�r eksplicit v�lge en at installere."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1000,65 +959,70 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Dog kan f�lgende pakker erstatte den:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Pakken %s har ingen installationskandidat"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s er i forvejen den nyeste version.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Udgaven '%s' for '%s' blev ikke fundet"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versionen '%s' for '%s' blev ikke fundet"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Valgte version %s (%s) af %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "'update'-kommandoen benytter ingen parametre"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Kunne ikke l�se listemappen"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
 "AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "F�lgende pakker blev installeret automatisk, og beh�ves ikke l�ngere:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Brug 'apt-get autoremove' til at fjerne dem."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1076,43 +1040,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern fejl. AutoRemover �delagde noget"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern fejl, AllUpgrade �delagde noget"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Kunne ikke finde opgaven %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s sat til manuelt installeret.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1120,7 +1084,7 @@ msgstr ""
 "Uopfyldte afh�ngigheder. Pr�v 'apt-get -f install' uden pakker (eller angiv "
 "en l�sning)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1131,115 +1095,115 @@ 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:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "�delagte pakker"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "F�lgende yderligere pakker vil blive installeret:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Foresl�ede pakker:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Anbefalede pakker:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Beregner opgraderingen... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Mislykkedes"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "F�rdig"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern fejl. Probleml�seren �delagde noget"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunne ikke finde kildetekstpakken for %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Overspringer allerede hentet fil '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Henter kildetekst %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen opbygningsafh�ngigheder.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1211,7 @@ msgid ""
 msgstr ""
 "%s-afh�ngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1220,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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Opbygningsafh�ngigheden for %s kunne ikke opfyldes."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafh�ngighederne"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Underst�ttede moduler:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1298,7 +1262,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1365,6 +1329,14 @@ msgstr ""
 "for flere oplysninger og tilvalg.\n"
 "                       Denne APT har \"Super Cow Powers\".\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Havde "
@@ -1598,9 +1570,9 @@ msgstr "Overskriv pakkematch uden version for %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "File %s/%s overskriver filen i pakken %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunne ikke l�se %s"
@@ -1834,7 +1806,7 @@ msgstr "Tidsudl�b p� forbindelsen"
 msgid "Server closed the connection"
 msgstr "Serveren lukkede forbindelsen"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "L�sefejl"
 
@@ -1846,7 +1818,7 @@ msgstr "Mellemlageret blev overfyldt af et svar."
 msgid "Protocol corruption"
 msgstr "Protokolfejl"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Skrivefejl"
 
@@ -1900,7 +1872,7 @@ msgstr "Tidsudl�b p� datasokkel-forbindelse"
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
@@ -1984,40 +1956,40 @@ msgstr "Der skete noget underligt under navneoms�tning af '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Kunne ikke forbinde til %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Kunne ikke tilg� n�gleringent '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 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:205
+#: methods/gpgv.cc:223
 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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "St�dte p� mindst �n ugyldig signatur."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunne ikke k�re '%s' for at verificere signaturen (er gpgv installeret?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Ukendt fejl ved k�rsel af gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "F�lgende signaturer var ugyldige:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2035,82 +2007,82 @@ msgstr "Kunne ikke �bne datar�r for %s"
 msgid "Read error from %s process"
 msgstr "L�sefejl fra %s-process"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Afventer hoveder"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Ugyldig linje i hovedet"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http-serveren sendte et ugyldigt svarhovede"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr ""
 "Denne http-servere har fejlagtig underst�ttelse af intervaller ('ranges')"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Ukendt datoformat"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Valg mislykkedes"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Tidsudl�b p� forbindelsen"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved l�sning fra serveren. Den fjerne ende lukkede forbindelsen"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Fejl ved l�sning fra server"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Kunne ikke skrive filen %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Intern fejl"
 
@@ -2123,11 +2095,38 @@ msgstr "Kan ikke udf�re mmap for en tom fil"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Kunne ikke udf�re mmap for %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Det valgte %s blev ikke fundet"
@@ -2142,42 +2141,42 @@ msgstr "Ukendt type-forkortelse: '%c'"
 msgid "Opening configuration file %s"
 msgstr "�bner konfigurationsfilen %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksfejl %s:%u: Blokken starter uden navn."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaksfejl %s:%u: Forkert udformet m�rke"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaksfejl %s:%u: Overskydende affald efter v�rdien"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaksfejl %s:%u: For mange sammenk�dede inkluderinger"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaksfejl %s:%u: Inkluderet herfra"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksfejl %s:%u: Ikke-underst�ttet direktiv '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen"
@@ -2244,7 +2243,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Kunne ikke finde monteringspunktet %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kunne ikke skifte til %s"
@@ -2278,143 +2277,153 @@ msgstr "Kunne ikke opn� l�sen %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventede p� %s, men den var der ikke"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprocessen %s modtog en segmenteringsfejl."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Underprocessen %s modtog en segmenteringsfejl."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprocessen %s returnerede en fejlkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprocessen %s afsluttedes uventet"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunne ikke �bne filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "l�s, mangler stadig at l�se %lu men der er ikke flere"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "skriv, mangler stadig at skrive %lu men kunne ikke"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problem under lukning af fil"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Fejl ved frigivelse af filen"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problem under synkronisering af fil"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Tomt pakke-mellemlager"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Pakke-mellemlagerets fil er �delagt"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Pakke-mellemlagerets fil er af en inkompatibel version"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denne APT underst�tter ikke versionssystemet '%s'"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Afh�ngigheder"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Pr�-afh�ngigheder"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Foresl�ede"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Anbefalede"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Overfl�digg�r"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "�del�gger"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "vigtig"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "kr�vet"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "frivillig"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Opbygger afh�ngighedstr�"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Kandidatversioner"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Afh�ngighedsgenerering"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "L�ser tilstandsoplysninger"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Kunne ikke �bne StateFile %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Kunne ikke skrive den midlertidige StateFile %s"
@@ -2503,7 +2512,7 @@ msgid ""
 msgstr ""
 "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2511,12 +2520,12 @@ msgstr ""
 "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
 "tilbageholdte pakker."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Kunne ikke korrigere problemerne, da du har tilbageholdt �delagte pakker."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2524,24 +2533,24 @@ msgstr ""
 "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle "
 "bruges i stedet."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Listemappen %spartial mangler."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Arkivmappen %spartial mangler."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Henter fil %li ud af %li (%s tilbage)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Henter fil %li ud af %li"
@@ -2556,17 +2565,17 @@ msgstr "Metodedriveren %s blev ikke fundet."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startede ikke korrekt"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 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:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet '%s' underst�ttes ikke"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunne ikke bestemme en passende pakkesystemtype"
 
@@ -2587,16 +2596,18 @@ msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller �bnes."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Du kan muligvis rette problemet ved at k�re 'apt-get update'"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Kunne ikke forst� pin-type %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
 
@@ -2742,6 +2753,23 @@ msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
 msgid "Size mismatch"
 msgstr "St�rrelsen stemmer ikke"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Kunne ikke tolke pakkefilen %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Bem�rk, at %s v�lges fremfor %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2800,6 +2828,15 @@ msgstr ""
 "Fandt %i pakkeindekser, %i kildeindekser, %i overs�ttelsesindekser og %i "
 "signaturer\n"
 
+#: apt-pkg/cdrom.cc:689
+#, fuzzy
+#| msgid ""
+#| "Unable to locate any package files, perhaps this is not a Debian Disc"
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr "Kunne ikke finde nogen pakkefiler. Det er muligvis ikke en Debiandisk"
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2830,22 +2867,22 @@ msgstr "Skriver ny kildeliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Denne disk har f�lgende kildeliste-indgange:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, 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"
@@ -2855,12 +2892,12 @@ msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
 msgid "Installing %s"
 msgstr "Installerede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "S�tter %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
@@ -2870,61 +2907,82 @@ msgstr "Fjerner %s"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listemappen %spartial mangler."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Klarg�r %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker %s ud"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "G�r klar til at s�tte %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "Fejl under behandling af mappen %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Installerede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "G�r klar til afinstallation af %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "G�r klar til at fjerne %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernede %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kunne ikke l�se listemappen"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kunne ikke p�f�re filen %s en lap"
@@ -2933,6 +2991,13 @@ msgstr "Kunne ikke p�f�re filen %s en lap"
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen lukkedes for hurtigt"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Fejl under behandling af mappen %s"
+
 #~ 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"
@@ -3090,11 +3155,6 @@ msgstr "Forbindelsen lukkedes for hurtigt"
 #~ msgid " source indexes."
 #~ msgstr " kildeindekser."
 
-#~ msgid ""
-#~ "Unable to locate any package files, perhaps this is not a Debian Disc"
-#~ msgstr ""
-#~ "Kunne ikke finde nogen pakkefiler. Det er muligvis ikke en Debiandisk"
-
 #~ msgid " '"
 #~ msgstr " '"
 
diff --git a/po/de.po b/po/de.po
index b416a2988..9b025dd94 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,169 +1,166 @@
 # German messages for the apt suite.
 # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
-# Holger Wansing <linux@wansing-online.de>, 2008.
+# Holger Wansing <linux@wansing-online.de>, 2008, 2009.
 # Jens Seidel <jensseidel@users.sf.net>, 2008.
 # 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.7.14\n"
+"Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-13 21:31+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-07-12 01:12+0200\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
-"Language-Team: <debian-l10n-german@lists.debian.org>\n"
+"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);>\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s Version %s hat eine nicht erfüllte Abhängigkeit:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kann Paket %s nicht finden"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Gesamtzahl an Paketnamen: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  davon gewöhnliche Pakete: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  davon rein virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  davon einzelne virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  davon gemischte virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  davon fehlend: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Gesamtzahl an unterschiedlichen Versionen: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Gesamtzahl an unterschiedlichen Beschreibungen: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Gesamtzahl an Abhängigkeiten: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Gesamtzahl an Version/Datei-Beziehungen: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Gesamtzahl an Beschreibung/Datei-Beziehungen: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Gesamtzahl an Bereitstellungen: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Gesamtzahl an Mustern: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Gesamtmenge an Abhängigkeits/Versionsspeicher: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Gesamtmenge an Slack: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Gesamtmenge an Speicher: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketdatei %s ist nicht synchronisiert."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Sie müssen genau ein Muster angeben"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Keine Pakete gefunden"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Paketdateien:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Per Pinning verwaltete Pakete:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(nicht gefunden)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Installiert: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(keine)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Paket-Pinning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Versions-Tabelle:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s für %s, kompiliert am %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -201,7 +198,7 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
-"Aufruf: apt-cache [Optionen] Befehl\n"
+"Aufruf: apt-cache [Optionen] befehl\n"
 "        apt-cache [Optionen] add datei1 [datei2 ...]\n"
 "        apt-cache [Optionen] showpkg paket1 [paket2 ...]\n"
 "        apt-cache [Optionen] showsrc paket1 [paket2 ...]\n"
@@ -663,79 +660,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Die folgenden Pakete haben nicht erfüllte Abhängigkeiten:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "aber %s ist installiert"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "aber %s soll installiert werden"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "ist aber nicht installierbar"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "ist aber ein virtuelles Paket"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "ist aber nicht installiert"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "soll aber nicht installiert werden"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " oder"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Die folgenden NEUEN Pakete werden installiert:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Die folgenden Pakete werden ENTFERNT:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Die folgenden Pakete sind zurückgehalten worden:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Die folgenden Pakete werden aktualisiert:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Die folgenden Pakete werden DEAKTUALISIERT:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Die folgenden gehaltenen Pakete werden verändert:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (wegen %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -743,145 +740,145 @@ msgstr ""
 "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
 "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualisiert, %lu neu installiert, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu erneut installiert, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu deaktualisiert, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nicht vollständig installiert oder entfernt.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Abhängigkeiten werden korrigiert..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " fehlgeschlagen."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Kann Abhängigkeiten nicht korrigieren"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Kann die Menge zu aktualisierender Pakete nicht minimieren"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Fertig"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nicht erfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Authentifizierungswarnung überstimmt.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Einige Pakete konnten nicht authentifiziert werden"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interner Fehler, Anordnung beendete nicht"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Kann das Downloadverzeichnis nicht sperren."
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Die Liste der Quellen konnte nicht gelesen werden."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Konnte freien Platz in %s nicht bestimmen"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Sie haben nicht genug Platz in %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation."
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Ja, tue was ich sage!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -892,28 +889,28 @@ msgstr ""
 "Zum Fortfahren geben Sie bitte »%s« ein.\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Abbruch."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Möchten Sie fortfahren [J/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Konnte %s nicht holen  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Einige Dateien konnten nicht heruntergeladen werden"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -921,48 +918,48 @@ msgstr ""
 "Konnte einige Archive nicht herunterladen; vielleicht »apt-get update« "
 "ausführen oder mit »--fix-missing« probieren?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Konnte fehlende Pakete nicht korrigieren."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Installation abgebrochen."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Hinweis: wähle %s an Stelle von %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Installiert]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Sie sollten eines explizit zum Installieren auswählen."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -973,55 +970,60 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Doch die folgenden Pakete ersetzen es:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Paket %s hat keinen Installationskandidaten"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Erneute Installation von %s ist nicht möglich,\n"
 "es kann nicht heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ist schon die neueste Version.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release »%s« für »%s« konnte nicht gefunden werden"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Gewählte Version %s (%s) für %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "Kein Quellpaket »%s«, wähle stattdessen »%s«\n"
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Der Befehl »update« akzeptiert keine Argumente"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Kann das Listenverzeichnis nicht sperren"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Es soll nichts gelöscht werden, kann AutoRemover nicht starten"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1029,11 +1031,11 @@ msgstr ""
 "Die folgenden Pakete wurden automatisch installiert und werden nicht länger "
 "benötigt:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1052,44 +1054,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Konnte Task %s nicht finden"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Konnte Paket %s nicht finden"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Hinweis: wähle %s für regulären Ausdruck »%s«\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s wurde als manuell installiert festgelegt.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1097,7 +1099,7 @@ msgstr ""
 "Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
 "jegliche Pakete (oder geben Sie eine Lösung an)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1109,120 +1111,120 @@ msgstr ""
 "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n"
 "erstellt wurden oder Incoming noch nicht verlassen haben."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Kaputte Pakete"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Berechne Upgrade (Paketaktualisierung) ..."
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Fertig"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
 "sollen"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kann Quellpaket für %s nicht finden"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Überspringe schon heruntergeladene Datei »%s«\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hole Quelle %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Konnte einige Archive nicht holen."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n"
 "überprüft werden sollen."
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden."
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s hat keine Bau-Abhängigkeiten.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1231,7 +1233,7 @@ msgstr ""
 "%s-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht gefunden "
 "werden kann."
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1240,32 +1242,32 @@ msgstr ""
 "%s-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare "
 "Version von Paket %s die Versionsanforderungen erfüllen kann."
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1281,7 +1283,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1324,7 +1326,7 @@ msgstr ""
 "  remove          – Pakete entfernen\n"
 "  autoremove      – alle nicht mehr verwendeten Pakete automatisch "
 "entfernen\n"
-"  purge           – entferne Pakete restlos\n"
+"  purge           – entferne Pakete restlos (inkl. Konfigurationsdateien)\n"
 "  source          – Quellarchive herunterladen\n"
 "  build-dep       – die Bau-Abhängigkeiten für Quellpakete konfigurieren\n"
 "  dist-upgrade    – spezielles Upgrade (Paketaktualisierung) für die "
@@ -1356,6 +1358,19 @@ msgstr ""
 "weitergehende Informationen und Optionen.\n"
 "                                    Dieses APT hat Super-Kuh-Kräfte.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+"HINWEIS: Dies ist nur eine Simulation!\n"
+"         apt-get benötigt root-Privilegien für die reale Ausführung.\n"
+"         Behalten Sie ebenfalls in Hinterkopf, dass die Sperren deaktiviert\n"
+"         sind, verlassen Sie sich also bezüglich des realen aktuellen\n"
+"         Status' der Sperre nicht darauf!"
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "OK   "
@@ -1591,9 +1606,9 @@ msgstr "Überschreibe Paket-Treffer ohne Version für %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Datei %s/%s überschreibt die Datei in Paket %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kann %s nicht lesen"
@@ -1829,7 +1844,7 @@ msgstr "Zeitüberschreitung der Verbindung"
 msgid "Server closed the connection"
 msgstr "Der Server hat die Verbindung geschlossen"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lesefehler"
 
@@ -1841,7 +1856,7 @@ msgstr "Eine Antwort hat den Puffer zum Überlaufen gebracht."
 msgid "Protocol corruption"
 msgstr "Protokoll beschädigt"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Schreibfehler"
 
@@ -1895,7 +1910,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
 msgid "Unable to accept connection"
 msgstr "Kann Verbindung nicht annehmen"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
 
@@ -1981,42 +1996,42 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Kann nicht mit %s %s verbinden:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Konnte nicht auf Schlüsselring zugreifen: »%s«"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "F: Argumentliste von Acquire::gpgv::Options zu lang. Abbruch."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Konnte »%s« zum Überprüfen der Signatur nicht ausführen (ist gpgv "
 "installiert?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Unbekannter Fehler beim Ausführen von gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Die folgenden Signaturen waren ungültig:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2035,82 +2050,82 @@ msgstr "Konnte keine Pipe (Weiterleitung) für %s öffnen"
 msgid "Read error from %s process"
 msgstr "Lesefehler von Prozess %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Warte auf Kopfzeilen"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Ungültige Kopfzeile"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Der HTTP-Server sandte eine ungültige Antwort-Kopfzeile"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Der HTTP-Server sandte eine ungültige »Content-Length«-Kopfzeile"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Der HTTP-Server sandte eine ungültige »Content-Range«-Kopfzeile"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Der HTTP-Server unterstützt Datei-Teilübertragung nur fehlerhaft."
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Unbekanntes Datumsformat"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Verbindung erlitt Zeitüberschreitung"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben einer Datei"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fehler beim Lesen vom Server: Der Server am anderen Ende hat die Verbindung "
 "geschlossen"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Konnte Datei nicht einkürzen"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -2123,11 +2138,40 @@ msgstr "Kann eine leere Datei nicht mit mmap abbilden"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Konnte kein mmap von %lu Bytes durchführen"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Kein Platz für Dynamic MMap"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Nicht genügend Platz für Dynamic MMap. Bitte erhöhen Sie den Wert von APT::"
+"Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%liT %liS %liMin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liS %liMin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr "%liMin %lis"
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Auswahl %s nicht gefunden"
@@ -2142,43 +2186,43 @@ msgstr "Nicht erkannte Typabkürzung: »%c«"
 msgid "Opening configuration file %s"
 msgstr "Öffne Konfigurationsdatei %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaxfehler %s:%u: Block fängt ohne Namen an."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll nach Wert"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (include)"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaxfehler %s:%u: Eingefügt von hier"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende"
@@ -2246,7 +2290,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Kann kein »stat« auf dem Einhängepunkt %s durchführen."
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kann nicht nach %s wechseln"
@@ -2280,143 +2324,153 @@ msgstr "Konnte Lock %s nicht bekommen"
 msgid "Waited for %s but it wasn't there"
 msgstr "Auf %s gewartet, aber es war nicht da"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Unterprozess %s ist mit einem Fehlercode zurückgekehrt (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Unterprozess %s hat sich unerwartet beendet"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Konnte Datei %s nicht öffnen"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "Lese, habe noch %lu zu lesen, aber nichts mehr übrig"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "Schreiben, habe noch %lu zu schreiben, konnte aber nicht"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Beim Schließen der Datei trat ein Problem auf"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Beim Unlinking der Datei trat ein Problem auf"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Beim Synchronisieren einer Datei trat ein Problem auf"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Leerer Paket-Cache"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Die Paket-Cache-Datei ist beschädigt"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Die Paket-Cache-Datei liegt in einer inkompatiblen Version vor"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Dieses APT unterstützt das Versionssystem »%s« nicht"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Der Paket-Cache wurde für eine andere Architektur aufgebaut"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Hängt ab"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Hängt ab (vorher)"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Schlägt vor"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Empfiehlt"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Kollidiert"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Ersetzt"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Veraltet"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Stört"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr "Wertet auf"
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "wichtig"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "erforderlich"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Abhängigkeitsbaum wird aufgebaut"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Mögliche Versionen"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Abhängigkeits-Generierung"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Lese Status-Informationen ein"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Konnte Statusdatei %s nicht öffnen"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Konnte temporäre Statusdatei %s nicht schreiben"
@@ -2506,7 +2560,7 @@ msgstr ""
 "Das Paket %s muss neu installiert werden, ich kann aber kein Archiv dafür "
 "finden."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2514,11 +2568,11 @@ msgstr ""
 "Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies "
 "könnte durch gehaltene Pakete hervorgerufen worden sein."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene defekte Pakete."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2526,24 +2580,24 @@ msgstr ""
 "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden "
 "ignoriert oder alte an ihrer Stelle benutzt."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Listenverzeichnis %spartial fehlt."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Archivverzeichnis %spartial fehlt."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Hole Datei %li von %li (noch %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Hole Datei %li von %li"
@@ -2558,19 +2612,19 @@ msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
 msgid "Method %s did not start correctly"
 msgstr "Methode %s ist nicht korrekt gestartet"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« und drücken Sie "
 "die Eingabetaste."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketierungssystem »%s« wird nicht unterstützt"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen"
 
@@ -2595,16 +2649,18 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren."
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ungültiger Eintrag in Einstellungsdatei, keine »Package«-Kopfzeilen"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Konnte Pinning-Typ (pin type) %s nicht verstehen"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Keine Priorität (oder Null) für Pin angegeben"
 
@@ -2757,6 +2813,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Größe stimmt nicht überein"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Kann Paketdatei %s nicht verarbeiten (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Hinweis: wähle %s an Stelle von %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2815,6 +2888,12 @@ msgstr ""
 "Fand %zu Paketindizes, %zu Quellindizes, %zu Übersetzungsindizes und %zu "
 "Signaturen\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2845,22 +2924,22 @@ msgstr "Schreibe neue Quellliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Quelllisteneinträge für diese Disk sind:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Es wurden %i Datensätze geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2872,12 +2951,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Installiere %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfiguriere %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "%s wird entfernt"
@@ -2887,63 +2966,84 @@ msgstr "%s wird entfernt"
 msgid "Running post-installation trigger %s"
 msgstr "Rufe Nach-Installations-Trigger %s auf"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Verzeichnis »%s« fehlt"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wird entpackt"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Konfiguration von %s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Verarbeite Auslöser (Trigger) für %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s installiert"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Entfernen von %s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Komplettes Entfernen von %s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s vollständig entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kann Protokoll nicht schreiben, openpty() schlug fehl (/dev/pts nicht "
 "eingehangen?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kann das Listenverzeichnis nicht sperren"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr "Nicht gesperrt"
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Konnte Datei nicht patchen"
@@ -2952,13 +3052,8 @@ msgstr "Konnte Datei nicht patchen"
 msgid "Connection closed prematurely"
 msgstr "Verbindung zu früh beendet"
 
-#~ 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 "
-#~ "wahrscheinlich,\n"
-#~ "dass das Paket einfach nicht installierbar ist; Sie sollten einen "
-#~ "Fehlerbericht\n"
-#~ "gegen dieses Paket erstellen."
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Verarbeite Auslöser (Trigger) für %s"
diff --git a/po/dz.po b/po/dz.po
index ac2885992..e30abd03c 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -18,193 +18,152 @@ msgstr ""
 "X-Poedit-Country: Bhutan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "བརླག་སྟོར་ཞུགས་པ:"
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "རྟེན་འབྲེལ་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:"
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།"
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་ཁར་ཨིན་པས་  ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པས།"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(མ་ཐོབ།)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(ཅི་མེད།)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "མི་ངོ:"
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "%4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -696,79 +655,79 @@ msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི�
 msgid "Failed to rename %s to %s"
 msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "ཝའི།"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr "ཡང་ན།"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s( %s་གིས་སྦེ)"
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -776,147 +735,147 @@ msgstr ""
 "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
 "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr "འབད་ཚར་ཡི།"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་[y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "ནང་འཁོད་ཀྱི་འཛོལ་བ་  གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་"
 "ཡོད!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག"
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "ནང་འཁོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་  ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མཐུན་སྒྲིག་མི་འབད་"
 "བས།"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%sBལེན་ནི་ལུ་དགོཔ་པས། ཡིག་མཛོད་ཚི་གི་%sB་\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ཡིག་མཛོད་ཀྱི་%sB་འདི་ལེན་དགོ་པས།\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི་ཤུལ་ལས་ཌིཀསི་གི་བར་སྟོང་དེ་ལག་ལེན་འཐབ་འོང་།\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s་ནང་བར་སྟོང་"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།"
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -927,28 +886,28 @@ msgstr ""
 "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "བར་བཤོལ་འབད།"
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -956,49 +915,49 @@ msgstr ""
 "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་  apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
 "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
 "འབད་བས།\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "གྱིས་བྱིན་ཏེ་ཡོད་པའི་ཐུམ་སྒྲིལ་%s་འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "ཁྱོད་ཀྱི་གཞི་བཙུགས་འབད་ནི་ལུ་གཏན་འཁལ་སྦེ་གཅིག་སེལ་འཐུ་འབད་དགོ"
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1009,64 +968,69 @@ msgstr ""
 "འདི་གིས་ཐུམ་སྒྲིལ་ཅིག་བརླག་སྟོར་ཞུགས་ཡོདཔ་ཨིནམ་སྟོནམ་ཨིནམ་དང་ ཕན་མེད་སྦེ་གནས་ཡོདཔ་  ཡང་ན་\n"
 "འདི་གཞན་འབྱུང་ཅིག་ནང་ལས་ལས་རྐྱངམ་ཅིག་འཐོབ་ཚུགསཔ་ཨིན་པས།\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་ཐུམ་སྒྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "ཐུམ་སྒྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1082,44 +1046,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1127,7 +1091,7 @@ msgstr ""
 "མ་ཚང་བའི་རྟེན་འབྲེལ་  ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
 "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1138,122 +1102,122 @@ msgstr ""
 "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
 "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "འབད་ཚར་ཡི།"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB་ལེན་དགོཔ་འདུག་  འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1262,32 +1226,32 @@ msgstr ""
 "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
 "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་  གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
 "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1304,7 +1268,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1374,6 +1338,14 @@ msgstr ""
 "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
 "                       འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "ཨེབ།"
@@ -1608,9 +1580,9 @@ msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་�
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
@@ -1842,7 +1814,7 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས"
 msgid "Server closed the connection"
 msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "འཛོལ་བ་ལྷབ།"
 
@@ -1854,7 +1826,7 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས�
 msgid "Protocol corruption"
 msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "འཛོལ་བ་འབྲི།"
 
@@ -1908,7 +1880,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན�
 msgid "Unable to accept connection"
 msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
 
@@ -1992,43 +1964,43 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག  ཕྱིར་"
 "འཐོན་དོ།"
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་  འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
 "མ་ཚུགས?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2045,81 +2017,81 @@ msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འད�
 msgid "Read error from %s process"
 msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རྐྱང་པ་ཅིག་ཐོབ་ཡོད།"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "མགོ་ཡིག་གི་གྲལ་ཐིག་བྱང་ཉེས།"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-ཁྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ཁྱབ་ཚད་ཀྱི་རྒྱབ་སྐྱོར་དེ་ཆད་པ་བཟོ་བཏང་ནུག"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
@@ -2132,11 +2104,38 @@ msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབ�
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
@@ -2151,42 +2150,42 @@ msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི
 msgid "Opening configuration file %s"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:  སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན"
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།"
@@ -2253,7 +2252,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
@@ -2288,144 +2287,154 @@ msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚ�
 msgid "Waited for %s but it wasn't there"
 msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "ལྷག་  ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "འབྲི་  ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "མི་མཐུནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "ཚབ་བཙུགསཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "གལ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "དགོས་མཁོ་ཡོདཔ།"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "ཚད་ལྡན།"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "གདམ་ཁ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "ཐེབས།"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "མི་ངོ་འཐོན་རིམཚུ།"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 #, fuzzy
 msgid "Reading state information"
 msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -2515,7 +2524,7 @@ msgstr ""
 "ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་"
 "མ་ཐོབ།"
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2523,11 +2532,11 @@ msgstr ""
 "འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་"
 "སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།"
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2535,24 +2544,24 @@ msgstr ""
 "ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་  འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
 "རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག"
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
@@ -2567,17 +2576,17 @@ msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་�
 msgid "Method %s did not start correctly"
 msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།"
 
@@ -2599,16 +2608,18 @@ msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་  ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
 
@@ -2753,6 +2764,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "ཚད་མ་མཐུན།"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2810,6 +2838,12 @@ msgid ""
 "zu signatures\n"
 msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་  %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
@@ -2840,22 +2874,22 @@ msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གས
 msgid "Source list entries for this disc are:\n"
 msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2867,12 +2901,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "%s་རིམ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
@@ -2882,61 +2916,82 @@ msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
@@ -2946,6 +3001,13 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ�
 msgid "Connection closed prematurely"
 msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།"
+
 #~ 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"
diff --git a/po/el.po b/po/el.po
index ae6cf0015..14bde3b79 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -26,191 +26,150 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Αδυναμία εντοπισμού του πακέτου %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Συνολικά Ονόματα Πακέτων : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Κανονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr " Πλήρως Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr " Μονά Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr " Μικτά Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "Αγνοούμενα: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Σύνολο Εξαρτήσεων: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Σύνολο Αντιστοιχίσεων Παροχών: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Σύνολο Κοινών Στοιχειοσειρών : "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Σύνολο χώρου ασφαλείας: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Συνολικός Καταμετρημένος Χώρος: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Πρέπει να δώσετε ακριβώς μία παράσταση"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Δε βρέθηκαν πακέτα"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Αρχεία Πακέτου:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Καθηλωμένα Πακέτα:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(δε βρέθηκαν)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Εγκατεστημένα: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(κανένα)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Υποψήφιο: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr " Καθήλωση Πακέτου: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Πίνακας Έκδοσης:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -704,79 +663,79 @@ msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
 msgid "Failed to rename %s to %s"
 msgstr "Αποτυχία μετονομασίας του %s σε %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "σφάλμα μεταγλωτισμου - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "αλλά το %s είναι εγκατεστημένο"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "αλλά δεν είναι εγκαταστάσημο"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "αλλά είναι ένα εικονικό πακέτο"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "αλλά δεν είναι εγκατεστημένο"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " η"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (λόγω του %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -784,149 +743,149 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
 "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu επανεγκατεστημένα,"
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu υποβαθμισμένα, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Διόρθωση εξαρτήσεων..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " απέτυχε."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Ετοιμο"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
 "προβλήματα."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Υπάρχουν προβλήματα και δώσατε -y  χωρίς το --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages."
 "debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Μετά από αυτή τη λειτουργία, θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο  %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Ναι, κανε ότι λέω!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -937,28 +896,28 @@ msgstr ""
 "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Εγκατάλειψη."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Αποτυχία ανάκτησης του %s   %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -966,49 +925,49 @@ msgstr ""
 "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
 "ή το --fix-missing;"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Εγκατάλειψη της εγκατάστασης."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Εγκατεστημένα]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1020,66 +979,71 @@ msgstr ""
 "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο "
 "από άλλη πηγή\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
 "του\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Η εντολή update δεν παίρνει ορίσματα"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1097,43 +1061,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1141,7 +1105,7 @@ msgstr ""
 "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
 "πακέτο (ή καθορίστε μια λύση)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1153,120 +1117,120 @@ msgstr ""
 "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
 "μετακινηθεί από τα εισερχόμενα."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Χαλασμένα πακέτα"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Προτεινόμενα πακέτα:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Συνιστώμενα πακέτα:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Υπολογισμός της αναβάθμισης... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Ετοιμο"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
 "υλικό"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Μεταφόρτωση Κωδικα %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Η απογονική διεργασία απέτυχε"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1274,7 +1238,7 @@ msgid ""
 msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1283,32 +1247,33 @@ msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
 "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
 "είναι νεώτερο"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1324,7 +1289,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1390,6 +1355,14 @@ msgstr ""
 "για περισσότερες πληροφορίες και επιλογές.\n"
 "                       This APT has Super Cow Powers.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Hit "
@@ -1623,9 +1596,9 @@ msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδο
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Αδύνατη η ανάγνωση του %s"
@@ -1858,7 +1831,7 @@ msgstr "Λήξη χρόνου σύνδεσης"
 msgid "Server closed the connection"
 msgstr "Ο διακομιστής έκλεισε την σύνδεση"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Σφάλμα ανάγνωσης"
 
@@ -1870,7 +1843,7 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν�
 msgid "Protocol corruption"
 msgstr "Αλλοίωση του πρωτοκόλλου"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Σφάλμα εγγραφής"
 
@@ -1924,7 +1897,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο�
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 
@@ -2008,42 +1981,42 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το
 msgid "Unable to connect to %s %s:"
 msgstr "Αδύνατη η σύνδεση στο %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
 "αποτυπώματος?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
 "εγκατεστημένο το gpgv;)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2061,82 +2034,82 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το
 msgid "Read error from %s process"
 msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Αναμονή επικεφαλίδων"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Ελαττωματική γραμμή επικεφαλίδας"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Άγνωστη μορφή ημερομηνίας"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Η επιλογή απέτυχε"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Αποτυχία εγγραφής του αρχείου %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
@@ -2149,11 +2122,38 @@ msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχ
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Η επιλογή %s δε βρέθηκε"
@@ -2168,43 +2168,43 @@ msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'"
 msgid "Opening configuration file %s"
 msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου"
@@ -2272,7 +2272,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Αδύνατη η αλλαγή σε %s"
@@ -2309,143 +2309,153 @@ msgstr "Αδύνατο το κλείδωμα %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Άδειο cache πακέτων"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Εξαρτάται από"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "ΠροΕξαρτάται από"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Προτείνει"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Συστήνει"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Ασύμβατο με"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Αντικαθιστά"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Απαρχαιώνει"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Χαλάει"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "σημαντικό"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "απαιτούμενο"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "καθιερωμένο"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "προαιρετικό"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "επιπλέον"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Υποψήφιες Εκδόσεις"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Παραγωγή Εξαρτήσεων"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
@@ -2535,7 +2545,7 @@ msgstr ""
 "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
 "κάποιας κατάλληλης αρχείοθήκης."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2543,11 +2553,11 @@ msgstr ""
 "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
 "προκλήθηκε από κρατούμενα πακέτα."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2555,24 +2565,24 @@ msgstr ""
 "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
 "στη θέση τους."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Ο φάκελος λιστών %spartial αγνοείται."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Λήψη αρχείου %li του %li"
@@ -2587,19 +2597,19 @@ msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπι�
 msgid "Method %s did not start correctly"
 msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
 "enter."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
 
@@ -2622,16 +2632,18 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
@@ -2780,6 +2792,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Ανόμοιο μέγεθος"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2838,6 +2867,12 @@ msgstr ""
 "Βρέθηκαν %zu κατάλογοι πακέτων, %zu κατάλογοι πηγαίων, %zu κατάλογοι "
 "μεταφράσεων και %zu υπογραφές\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2868,22 +2903,22 @@ msgstr "Eγγραφή νέας λίστας πηγών\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Εγιναν %i εγγραφές.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
@@ -2893,12 +2928,12 @@ msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία κα�
 msgid "Installing %s"
 msgstr "Εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Ρύθμιση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Αφαιρώ το %s"
@@ -2908,63 +2943,84 @@ msgstr "Αφαιρώ το %s"
 msgid "Running post-installation trigger %s"
 msgstr "Εκτέλεση του post-installation trigger %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Ο φάκελος %s αγνοείται."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Προετοιμασία του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Ξεπακετάρισμα του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Προετοιμασία ρύθμισης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Επεξεργασία triggers για το %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Έγινε εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Προετοιμασία για την αφαίρεση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Αφαίρεσα το %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Αδυναμία εγγραφής στο αρχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι "
 "προσαρτημένο το /dev/pts;)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Αδύνατο το κλείδωμα του καταλόγου"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Αδύνατη η διόρθωση του αρχείου"
@@ -2973,6 +3029,12 @@ msgstr "Αδύνατη η διόρθωση του αρχείου"
 msgid "Connection closed prematurely"
 msgstr "Η σύνδεση έκλεισε πρόωρα"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Επεξεργασία triggers για το %s"
+
 #~ 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"
diff --git a/po/en_GB.po b/po/en_GB.po
index 0c232b979..ed866bbb8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-11-13 11:47+0000\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: en_GB <en_gb@li.org>\n"
@@ -15,153 +15,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Package %s version %s has an unmet dep:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Unable to locate package %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Total package names: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Normal packages: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Pure virtual packages: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Single virtual packages: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Mixed virtual packages: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Missing: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Total distinct versions: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Total distinct descriptions: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Total dependencies: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Total ver/file relations: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Total Desc/File relations: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Total Provides mappings: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Total globbed strings: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Total dependency version space: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Total slack space: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Total space accounted for: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Package file %s is out of sync."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "You must give exactly one pattern"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "No packages found"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Package files:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Pinned packages:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(not found)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Installed: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(none)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Candidate: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Package pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Version table:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s compiled on %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -647,79 +642,79 @@ msgstr "Problem unlinking %s"
 msgid "Failed to rename %s to %s"
 msgstr "Failed to rename %s to %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex compilation error - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "The following packages have unmet dependencies."
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "but %s is installed"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "but %s is to be installed"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "but it is not installable"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "but it is a virtual package"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "but it is not installed"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "but it is not going to be installed"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " or"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "The following NEW packages will be installed"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "The following packages will be REMOVED"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "The following packages have been kept back:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "The following packages will be upgraded:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "The following packages will be DOWNGRADED:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "The following held packages will be changed:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (due to %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -727,143 +722,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu upgraded, %lu newly installed, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalled, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu downgraded, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu to remove and %lu not upgraded.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu not fully installed or removed.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Correcting dependencies..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " failed."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Unable to correct dependencies"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Unable to minimise the upgrade set"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr "Done"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Unmet dependencies. Try using -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "WARNING: The following packages cannot be authenticated!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Authentication warning overridden.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Install these packages without verification [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Some packages could not be authenticated"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internal error, InstallPackages was called with broken packages!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Packages need to be removed but remove is disabled."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internal error, Ordering didn't finish"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Unable to lock the download directory"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "The list of sources could not be read."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Need to get %sB/%sB of archives.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Need to get %sB of archives.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "After this operation, %sB of additional disk space will be used.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "After this operation, %sB disk space will be freed.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Couldn't determine free space in %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -874,28 +869,28 @@ msgstr ""
 "To continue type in the phrase ‘%s’\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Abort."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Do you want to continue [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Failed to fetch %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Some files failed to download"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Download complete and in download only mode"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -903,47 +898,47 @@ msgstr ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing and media swapping is not currently supported"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Unable to correct missing packages."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Aborting install."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Note, selecting %s instead of %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Installed]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "You should explicitly select one to install."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -954,53 +949,58 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "However the following packages replace it:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Package %s has no installation candidate"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s is already the newest version.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release ‘%s’ for ‘%s’ was not found"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version ‘%s’ for ‘%s’ was not found"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Selected version %s (%s) for %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "The update command takes no arguments"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Unable to lock the list directory"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We are not supposed to delete stuff, cannot start AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1008,11 +1008,11 @@ msgstr ""
 "The following packages were automatically installed and are no longer "
 "required:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' to remove them."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1030,43 +1030,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "The following information may help to resolve the situation:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internal Error, AutoRemoved broke stuff"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, AllUpgrade broke stuff"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Couldn't find task %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Couldn't find package %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, selecting %s for regex ‘%s’\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s set to manually installed.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1074,7 +1074,7 @@ msgstr ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1086,116 +1086,116 @@ msgstr ""
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Broken packages"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "The following extra packages will be installed:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Suggested packages:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Recommended packages:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Calculating upgrade... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Failed"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Done"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internal error, problem resolver broke stuff"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Unable to find a source package for %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Skipping already downloaded file '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Need to get %sB of source archives.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fetch source %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Failed to fetch some archives."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Unpack command ‘%s’ failed.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build command ‘%s’ failed.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Child process failed"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Must specify at least one package for which you want to check builddeps"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Unable to get build-dependency information for %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s has no build depends.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1204,7 +1204,7 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1213,31 +1213,32 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Failed to satisfy %s dependency for %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Build-dependencies for %s could not be satisfied."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Failed to process build dependencies"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Supported modules:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1253,7 +1254,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1321,6 +1322,14 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Hit "
@@ -1550,9 +1559,9 @@ msgstr "Overwrite package match with no version for %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "File %s/%s overwrites the one in the package %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Unable to read %s"
@@ -1784,7 +1793,7 @@ msgstr "Connection timeout"
 msgid "Server closed the connection"
 msgstr "Server closed the connection"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Read error"
 
@@ -1796,7 +1805,7 @@ msgstr "A response overflowed the buffer."
 msgid "Protocol corruption"
 msgstr "Protocol corruption"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Write error"
 
@@ -1850,7 +1859,7 @@ msgstr "Data socket connect timed out"
 msgid "Unable to accept connection"
 msgstr "Unable to accept connection"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem hashing file"
 
@@ -1934,39 +1943,39 @@ msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Unable to connect to %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Couldn't access keyring: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 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:205
+#: methods/gpgv.cc:223
 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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "At least one invalid signature was encountered."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Could not execute '%s' to verify signature (is gpgv installed?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Unknown error executing gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "The following signatures were invalid:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1984,80 +1993,80 @@ msgstr "Couldn't open pipe for %s"
 msgid "Read error from %s process"
 msgstr "Read error from %s process"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Waiting for headers"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Got a single header line over %u chars"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Bad header line"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "The HTTP server sent an invalid reply header"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "The HTTP server sent an invalid Content-Length header"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "The HTTP server sent an invalid Content-Range header"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "This HTTP server has broken range support"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Unknown date format"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Select failed"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Connection timed out"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Error writing to output file"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Error writing to file"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Error writing to the file"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error reading from server. Remote end closed connection"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Error reading from server"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Failed to truncate file"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Bad header data"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Internal error"
 
@@ -2070,11 +2079,38 @@ 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/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selection %s not found"
@@ -2089,42 +2125,42 @@ msgstr "Unrecognized type abbreviation: ‘%c’"
 msgid "Opening configuration file %s"
 msgstr "Opening configuration file %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntax error %s:%u: Block starts with no name."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntax error %s:%u: Malformed tag"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntax error %s:%u: Extra junk after value"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntax error %s:%u: Directives can only be done at the top level"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntax error %s:%u: Too many nested includes"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntax error %s:%u: Included from here"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntax error %s:%u: Unsupported directive ‘%s’"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntax error %s:%u: Extra junk at end of file"
@@ -2191,7 +2227,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Unable to stat the mount point %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Unable to change to %s"
@@ -2225,143 +2261,153 @@ msgstr "Could not get lock %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Waited for %s but it wasn't there"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Sub-process %s received a segmentation fault."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Sub-process %s received a segmentation fault."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Sub-process %s returned an error code (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Sub-process %s exited unexpectedly"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Could not open file %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "read, still have %lu to read but none left"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "write, still have %lu to write but couldn't"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problem closing the file"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problem unlinking the file"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problem syncing the file"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Empty package cache"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "The package cache file is corrupted"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "The package cache file is an incompatible version"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "The package cache was built for a different architecture"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Depends"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "PreDepends"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Suggests"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Recommends"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Conflicts"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Replaces"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Obsoletes"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Breaks"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "required"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Building dependency tree"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Candidate versions"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Dependency generation"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Reading state information"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Failed to open StateFile %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Failed to write temporary StateFile %s"
@@ -2449,7 +2495,7 @@ msgid ""
 msgstr ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2457,11 +2503,11 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Unable to correct problems, you have held broken packages."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2469,24 +2515,24 @@ msgstr ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Lists directory %spartial is missing."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Archive directory %spartial is missing."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Retrieving file %li of %li (%s remaining)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Retrieving file %li of %li"
@@ -2501,18 +2547,18 @@ msgstr "The method driver %s could not be found."
 msgid "Method %s did not start correctly"
 msgstr "Method %s did not start correctly"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Unable to determine a suitable packaging system type"
 
@@ -2533,16 +2579,18 @@ msgstr "The package lists or status file could not be parsed or opened."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "You may want to run apt-get update to correct these problems"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Invalid record in the preferences file, no Package header"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Did not understand pin type %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "No priority (or zero) specified for pin"
 
@@ -2685,6 +2733,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Size mismatch"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Unable to parse package file %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Note, selecting %s instead of %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2743,6 +2808,12 @@ msgstr ""
 "Found %zu package indices, %zu source indices, %zu translation indices and %"
 "zu signatures\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2773,22 +2844,22 @@ msgstr "Writing new source list\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Source list entries for this disc are:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Wrote %i records.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Wrote %i records with %i missing files.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Wrote %i records with %i mismatched files\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, 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"
@@ -2798,12 +2869,12 @@ msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
 msgid "Installing %s"
 msgstr "Installing %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Configuring %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Removing %s"
@@ -2813,61 +2884,82 @@ msgstr "Removing %s"
 msgid "Running post-installation trigger %s"
 msgstr "Running post-installation trigger %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory '%s' missing."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparing %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Unpacking %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparing to configure %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Processing triggers for  %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Installed %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparing for removal of %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Removed %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparing to completely remove %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Completely removed %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Unable to lock the list directory"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Could not patch file"
@@ -2875,3 +2967,12 @@ msgstr "Could not patch file"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Connection closed prematurely"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Processing triggers for  %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamic MMap ran out of room"
diff --git a/po/es.po b/po/es.po
index ecd6e5b75..6b789781d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-11-15 21:52+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -17,155 +17,150 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "El paquete %s versi�n %s tiene dependencias incumplidas:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "No se ha podido localizar el paquete %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Nombres de paquetes totales: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Paquetes normales: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuales puros: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuales �nicos: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuales mixtos: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Faltan: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Versiones diferentes totales: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Descipciones diferentes totales: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Dependencias totales: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Relaciones versi�n/archivo totales: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Relaciones descripci�n/archivo totales: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Mapeo Total de Provisiones: "
 
 # globbed -> globalizadas ? (jfs)
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Cadenas globalizadas totales: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Espacio de versi�n de dependencias total: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Espacio desperdiciado total: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Espacio registrado total: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El archivo de paquetes %s est� desincronizado."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Debe dar exactamente un patr�n"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "No se encontr� ning�n paquete"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Archivos de paquetes:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Paquetes con pin:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(no encontrado)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Instalados: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(ninguno)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Pin del paquete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Tabla de versi�n:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado en %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -662,79 +657,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error de compilaci�n de expresiones regulares - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "pero %s est� instalado"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "pero %s va a ser instalado"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "pero no es instalable"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "pero es un paquete virtual"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "pero no est� instalado"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "pero no va a instalarse"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Se instalar�n los siguientes paquetes NUEVOS:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Los siguientes paquetes se ELIMINAR�N:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Los siguientes paquetes se han retenido:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Se actualizar�n los siguientes paquetes:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Se DESACTUALIZAR�N los siguientes paquetes:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Se cambiar�n los siguientes paquetes retenidos:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -742,146 +737,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualizados, %lu se instalar�n, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizados, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu para eliminar y %lu no actualizados.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu no instalados del todo o eliminados.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Corrigiendo dependencias..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " fall�."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "No se puede corregir las dependencias"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "No se puede minimizar el conjunto de actualizaci�n"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Listo"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: �No se han podido autenticar los siguientes paquetes!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticaci�n ignorado.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "�Instalar estos paquetes sin verificaci�n [s/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Algunos paquetes no se pueden autenticar"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, InstallPackages fue llamado con un paquete roto!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Los paquetes necesitan eliminarse pero Remove est� deshabilitado."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error interno, no termin� el ordenamiento"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "No se puede bloquear el directorio de descarga"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "No se pudieron leer las listas de fuentes."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Se necesita descargar %sB/%sB de archivos.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Necesito descargar %sB de archivos.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Se utilizar�n %sB de espacio de disco adicional despu�s de esta operaci�n.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Se liberar�n %sB despu�s de esta operaci�n.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No pude determinar el espacio libre en %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No tiene suficiente espacio libre en %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "S�, �haga lo que le digo!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -892,28 +887,28 @@ msgstr ""
 "Para continuar escriba la frase �%s�\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Abortado."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "�Desea continuar [S/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Imposible obtener %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Algunos archivos no pudieron descargarse"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en modo de s�lo descarga"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -921,47 +916,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:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "No se pudieron corregir los paquetes que faltan."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Abortando la instalaci�n."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Nota, seleccionando %s en lugar de %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Instalado]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Necesita seleccionar expl�citamente uno para instalar."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -972,54 +967,59 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Sin embargo, los siguientes paquetes lo reemplazan:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "El paquete %s no tiene candidato para su instalaci�n"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, 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:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "No se encontr� la Distribuci�n '%s' para '%s'"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "No se encontr� la versi�n '%s' para '%s'"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versi�n seleccionada %s (%s) para %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "El comando de actualizaci�n no toma argumentos"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "No se pudo bloquear el directorio de listas"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Se supone que no vamos a eliminar cosas, no se pudo iniciar �AutoRemover�"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1027,11 +1027,11 @@ msgstr ""
 "Se instalaron de forma autom�tica los siguientes paquetes y ya no son "
 "necesarios."
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilice �apt-get autoremove� para eliminarlos."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1049,43 +1049,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error interno, �AutoRemover� rompi� cosas"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error Interno, AllUpgrade rompi� cosas"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "No se pudo encontrar la tarea %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No se pudo encontrar el paquete %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "fijado %s como instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1093,7 +1093,7 @@ msgstr ""
 "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
 "especifique una soluci�n)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1105,119 +1105,119 @@ msgstr ""
 "inestable, que algunos paquetes necesarios no han sido creados o han\n"
 "sido movidos fuera de Incoming."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Se instalar�n los siguientes paquetes extras:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Paquetes sugeridos:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Calculando la actualizaci�n... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Fall�"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Listo"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 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:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, 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:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ignorando fichero ya descargado '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No tiene suficiente espacio libre en %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Necesito descargar %sB de archivos fuente.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fuente obtenida %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fall� la orden de desempaquetamiento '%s'.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fall� la orden de construcci�n '%s'.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Fall� el proceso hijo"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcci�n.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1226,7 +1226,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede \n"
 "encontrar el paquete %s"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1235,32 +1235,33 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcci�n"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "M�dulos soportados:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1276,7 +1277,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1345,6 +1346,14 @@ msgstr ""
 "para m�s informaci�n y opciones.\n"
 "                       Este APT tiene poderes de Super Vaca.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Obj "
@@ -1580,9 +1589,9 @@ msgstr "Sobreescribiendo concordancia del paquete sin versi�n para %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "El archivo %s/%s sobreescribe al que est� en el paquete %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "No pude leer %s"
@@ -1815,7 +1824,7 @@ msgstr "La conexi�n expir�"
 msgid "Server closed the connection"
 msgstr "El servidor cerr� la conexi�n"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Error de lectura"
 
@@ -1827,7 +1836,7 @@ msgstr "Una respuesta desbord� el buffer."
 msgid "Protocol corruption"
 msgstr "Corrupci�n del protocolo"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Error de escritura"
 
@@ -1881,7 +1890,7 @@ msgstr "Expir� conexi�n a socket de datos"
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexi�n"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Hay problemas enlazando fichero"
 
@@ -1965,41 +1974,41 @@ msgstr "Algo raro pas� resolviendo '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "No pude conectarme a %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "No se pudo acceder al anillo de claves: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 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:205
+#: methods/gpgv.cc:223
 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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Se encontr� al menos una firma inv�lida."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "No se pudo ejecutar '%s'  para verificar la firma (�est� instalado gpgv?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Error desconocido ejecutando gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Las siguientes firms fueron inv�lidas:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2017,80 +2026,80 @@ msgstr "No pude abrir una tuber�a para %s"
 msgid "Read error from %s process"
 msgstr "Error de lectura de %s procesos"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Esperando las cabeceras"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Mala l�nea de cabecera"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor de http envi� una cabecera de respuesta inv�lida"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "�ste servidor de http tiene el soporte de alcance roto"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Fall� la selecci�n"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Expir� la conexi�n"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerr� la conexi�n."
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Fall� al truncar el archivo"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Fallo la conexi�n"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Error interno"
 
@@ -2103,11 +2112,38 @@ msgstr "No puedo hacer mmap de un fichero vac�o"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "No pude hacer mmap de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "La funci�n �Dynamic MMap� se qued� sin espacio"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selecci�n %s no encontrada"
@@ -2122,44 +2158,44 @@ msgstr "Tipo de abreviaci�n no reconocida: '%c'"
 msgid "Opening configuration file %s"
 msgstr "Abriendo fichero de configuraci�n %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Error de sintaxis %s:%u: Marca mal formada"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Error de sintaxis %s:%u: Basura extra despu�s del valor"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Error de sintaxis %s:%u: Las directivas s�lo se pueden poner\n"
 "en el primer nivel"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Error de sintaxis %s:%u: Incluido desde aqu�"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Error de sintaxis %s:%u: Directiva '%s' no soportada"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo"
@@ -2228,7 +2264,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "No se puede obtener informaci�n del punto de montaje %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "No se pudo cambiar a %s"
@@ -2262,143 +2298,153 @@ msgstr "No se pudo bloquear %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero no estaba all�"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "El subproceso %s recibi� un fallo de segmentaci�n."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "El subproceso %s recibi� un fallo de segmentaci�n."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "El subproceso %s devolvi� un c�digo de error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El subproceso %s termin� de forma inesperada"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "No pude abrir el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "le�dos, todav�a deb�a leer %lu pero no queda nada"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escritos, todav�a ten�a que escribir %lu pero no pude hacerlo"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problemas cerrando el archivo"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Hay problemas desligando el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Hay problemas sincronizando el fichero"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Cach� de paquetes vac�a."
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "El archivo de cach� de paquetes esta corrompido"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 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:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Sugiere"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Entra en conflicto"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Reemplaza"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Hace obsoleto"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "requiere"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "est�ndar"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Creando �rbol de dependencias"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Versiones candidatas"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Generaci�n de dependencias"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Leyendo la informaci�n de estado"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "No se pudo abrir el fichero de estado %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Fall� la escritura del fichero de estado temporal %s"
@@ -2488,7 +2534,7 @@ msgstr ""
 "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
 "�ste."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2496,13 +2542,13 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve gener� cortes, esto puede haber sido "
 "causado por paquetes retenidos."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "No se pudieron corregir los problemas, usted ha retenido paquetes\n"
 "rotos."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2510,24 +2556,24 @@ msgstr ""
 "Algunos archivos de �ndice no se han podido descargar, se han ignorado,\n"
 "o se ha utilizado unos antiguos en su lugar."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Falta el directorio de listas %spartial."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Falta el directorio de archivos %spartial."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Descargando fichero %li de %li (falta %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Descargando fichero %li de %li"
@@ -2542,17 +2588,17 @@ msgstr "No se pudo encontrar el m�todo %s."
 msgid "Method %s did not start correctly"
 msgstr "El m�todo %s no se inici� correctamente"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Por favor, inserte el disco �%s� en la unidad �%s� y presione Intro"
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: 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"
 
@@ -2575,17 +2621,19 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Registro inv�lido en el archivo de preferencias, no hay cabecera de paquete"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "No se entiende el pin tipo %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "No hay prioridad especificada para pin (o es cero)"
 
@@ -2738,6 +2786,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "El tama�o difiere"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "No se pudo tratar el archivo de paquetes %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Nota, seleccionando %s en lugar de %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2796,6 +2861,17 @@ msgstr ""
 "Se encontraron %zu �ndices de paquetes, %zu �ndices de fuentes, %zu �ndices "
 "de traducci�n y %zu firmas\n"
 
+#: apt-pkg/cdrom.cc:689
+#, fuzzy
+#| msgid ""
+#| "Unable to locate any package files, perhaps this is not a Debian Disc"
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+"No pude localizar ning�n archivo de paquete, tal vez este no es un disco de "
+"Debian"
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2826,22 +2902,22 @@ msgstr "Escribiendo nueva lista de fuente\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Las entradas de la lista de fuentes para este disco son:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i registros escritos.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2852,12 +2928,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
@@ -2867,63 +2943,84 @@ msgstr "Eliminando %s"
 msgid "Running post-installation trigger %s"
 msgstr "Ejecutando disparador post-instalaci�n %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta el directorio '%s'."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Prepar�ndose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Procesando disparadores para %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Prepar�ndose para eliminar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s eliminado"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Prepar�ndose para eliminar completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Se borr� completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No se pudo escbribir en el registro, fall� la llamada a �openpty()� (�est� "
 "montado /dev/pts?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "No se pudo bloquear el directorio de listas"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "No pude parchear el fichero"
@@ -2932,6 +3029,15 @@ msgstr "No pude parchear el fichero"
 msgid "Connection closed prematurely"
 msgstr "La conexi�n se cerr� prematuramente"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Procesando disparadores para %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "La funci�n �Dynamic MMap� se qued� sin espacio"
+
 #~ 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"
@@ -3203,12 +3309,6 @@ msgstr "La conexi�n se cerr� prematuramente"
 #~ msgid " source indexes."
 #~ msgstr " �ndice de fuentes."
 
-#~ msgid ""
-#~ "Unable to locate any package files, perhaps this is not a Debian Disc"
-#~ msgstr ""
-#~ "No pude localizar ning�n archivo de paquete, tal vez este no es un disco "
-#~ "de Debian"
-
 #~ msgid " '"
 #~ msgstr " '"
 
diff --git a/po/eu.po b/po/eu.po
index 30c5c1538..f0ebe26bd 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2,13 +2,13 @@
 # This file is put in the public domain.
 #
 # Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
-# Piarres Beobide <pi@beobide.net>, 2005, 2006, 2007, 2008.
+# Piarres Beobide <pi@beobide.net>, 2005, 2006, 2007, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-18 10:32+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-05-17 00:41+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,155 +17,150 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ezin da %s paketea lokalizatu"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Pakete Izenak Guztira : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Pakete normalak:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Pakete birtual puruak:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Bakanako pakete birtualak: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Nahastutako pakete birtualak: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Falta direnak: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Bertsio Ezberdinak Guztira: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Azalpen Ezberdinak Guztira: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Dependentziak Guztira: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Guztira Bertsio/fitxategi erlazioak: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Fitx/Azalpen erlazioak guztira: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Guztira Saltzaile Mapatzea: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Guztira bateratutako kateak: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
-msgstr "Guztira bertsio dependentzi lekua: "
+msgstr "Guztira bertsio dependentzia lekua: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Guztira galdutako tokia:"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Guztira erregistratutako lekua: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "%s pakete fitxategia ez dago sinkronizatuta."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Zehazki eredu bat eman behar duzu."
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Ez da paketerik aurkitu"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Pakete Fitxategiak:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
 "pakete fitxategi bati"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Pin duten Paketeak:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(ez da aurkitu)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Instalatuta: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(bat ere ez)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Hautagaia: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Paketearen pin-a:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Bertsio taula:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -650,79 +645,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Adierazpen erregularren konpilazio errorea - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "baina %s instalatuta dago"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "baina %s instalatzeko dago"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "baina ez da instalagarria"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "baina pakete birtuala da"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "baina ez dago instalatuta"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "baina ez da instalatuko"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " edo"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Ondorengo paketeak KENDUKO dira:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Ondorengo paketeak mantendu egin dira:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Ondorengo paketeak bertsio-berrituko dira:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (arrazoia: %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 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 +725,145 @@ msgstr ""
 "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
 "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu berrinstalatuta, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu aurreko bertsiora itzulita, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ez erabat instalatuta edo kenduta.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Mendekotasunak zuzentzen..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " : huts egin du."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Ezin dira mendekotasunak zuzendu"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Eginda"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Egiaztapen abisua gainidazten.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Paketeak egiaztapen gabe instalatu [b/E]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Zenbait pakete ezin dira egiaztatu"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Barne errorea, ez da ordenatzeaz amaitu"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Ezin da deskarga direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Ezin izan da Iturburu zerrenda irakurri."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Artxiboetako %sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ezin da %s(e)n duzun leku librea atzeman."
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Bai, egin esandakoa!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -879,28 +874,28 @@ msgstr ""
 "Jarraitzeko, idatzi '%s' esaldia\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Abortatu."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ezin da lortu %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Fitxategi batzuk ezin izan dira deskargatu"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Deskarga amaituta eta deskarga soileko moduan"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -908,47 +903,47 @@ msgstr ""
 "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
 "--fix-missing aukerarekin saiatu?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Falta diren paketeak ezin dira zuzendu."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Abortatu instalazioa."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Instalatuta]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Zehazki bat hautatu behar duzu instalatzeko."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -959,53 +954,58 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Baina ondorengo paketeek ordezten dute:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "%s paketeak ez du instalatzeko hautagairik"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, 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:1195
+#: cmdline/apt-get.cc:1198
 #, 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:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Ezin da zerrenda direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1013,11 +1013,11 @@ msgstr ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "'apt-get autoremove' erabili ezabatzeko."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1035,43 +1035,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "Informazio honek arazoa konpontzen lagun dezake:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Ezin izan da %s zeregina aurkitu"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1079,7 +1079,7 @@ msgstr ""
 "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
 "zehaztu konponbide bat)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1091,117 +1091,117 @@ msgstr ""
 "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
 "Sarrerakoetan (Incoming) egoten jarraituko dute."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Hautsitako paketeak"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Iradokitako paketeak:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Gomendatutako paketeak:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Berriketak kalkulatzen... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Huts egin du"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Eginda"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Eskuratu %s iturburua\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s: ez du eraikitze mendekotasunik.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1209,7 +1209,7 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1218,32 +1218,74 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
+#| msgid ""
+#| "Usage: apt-get [options] command\n"
+#| "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+#| "       apt-get [options] source pkg1 [pkg2 ...]\n"
+#| "\n"
+#| "apt-get is a simple command line interface for downloading and\n"
+#| "installing packages. The most frequently used commands are update\n"
+#| "and install.\n"
+#| "\n"
+#| "Commands:\n"
+#| "   update - Retrieve new lists of packages\n"
+#| "   upgrade - Perform an upgrade\n"
+#| "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+#| "   remove - Remove packages\n"
+#| "   autoremove - Remove automatically all unused packages\n"
+#| "   purge - Remove and purge packages\n"
+#| "   source - Download source archives\n"
+#| "   build-dep - Configure build-dependencies for source packages\n"
+#| "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+#| "   dselect-upgrade - Follow dselect selections\n"
+#| "   clean - Erase downloaded archive files\n"
+#| "   autoclean - Erase old downloaded archive files\n"
+#| "   check - Verify that there are no broken dependencies\n"
+#| "\n"
+#| "Options:\n"
+#| "  -h  This help text.\n"
+#| "  -q  Loggable output - no progress indicator\n"
+#| "  -qq No output except for errors\n"
+#| "  -d  Download only - do NOT install or unpack archives\n"
+#| "  -s  No-act. Perform ordering simulation\n"
+#| "  -y  Assume Yes to all queries and do not prompt\n"
+#| "  -f  Attempt to correct a system with broken dependencies in place\n"
+#| "  -m  Attempt to continue if archives are unlocatable\n"
+#| "  -u  Show a list of upgraded packages as well\n"
+#| "  -b  Build the source package after fetching it\n"
+#| "  -V  Show verbose version numbers\n"
+#| "  -c=? Read this configuration file\n"
+#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+#| "pages for more information and options.\n"
+#| "                       This APT has Super Cow Powers.\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1259,7 +1301,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1299,7 +1341,7 @@ msgstr ""
 "   upgrade - Egin bertsio berritzea\n"
 "   install - Instalatu pakete berriak (paketea libc6 da, eta ez libc6.deb)\n"
 "   remove - Kendu paketeak\n"
-"  autoremove - Automatikoki kendu erabiltzen ez diren paketeak\n"
+"   autoremove - Automatikoki kendu erabiltzen ez diren paketeak\n"
 "   purge - Paketeak kendu eta garbitu\n"
 "   source - Deskargatu iturburu artxiboak\n"
 "   build-dep - Konfiguratu iturburu paketeen eraikitze dependentziak\n"
@@ -1327,6 +1369,14 @@ msgstr ""
 "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
 "                       APT honek Super Behiaren Ahalmenak ditu.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Atzituta "
@@ -1557,9 +1607,9 @@ msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ezin da %s irakurri"
@@ -1795,7 +1845,7 @@ msgstr "Konexioa denboraz kanpo"
 msgid "Server closed the connection"
 msgstr "Zerbitzariak konexioa itxi du"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Irakurketa errorea"
 
@@ -1807,7 +1857,7 @@ msgstr "Erantzun batek bufferrari gainez eragin dio."
 msgid "Protocol corruption"
 msgstr "Protokolo hondatzea"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Idazketa errorea"
 
@@ -1862,7 +1912,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du"
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
@@ -1947,38 +1997,38 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
 msgid "Unable to connect to %s %s:"
 msgstr "Ezin da konektatu -> %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Ezin da eraztuna ebatzi: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Beintza sinadura baliogabe bat aurkitu da."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Errore ezezaguna gpgv exekutatzean"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Ondorengo sinadurak baliogabeak dira:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1996,80 +2046,80 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 msgid "Read error from %s process"
 msgstr "Irakurri errorea %s prozesutik"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Goiburuen zain"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Okerreko goiburu-lerroa"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du."
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "http zerbitzariak barruti onarpena apurturik du"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Datu formatu ezezaguna"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Konexioaren denbora muga gainditu da"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Huts fitxategia mozterakoan"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Barne errorea"
 
@@ -2082,11 +2132,40 @@ msgstr "Ezin da fitxategi huts baten mmap egin"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Ezin izan da %lu byteren mmap egin"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "MMap dinamiko funtzioa leku gabe geratzen ari da"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko "
+"balioa: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s hautapena ez da aurkitu"
@@ -2101,42 +2180,42 @@ msgstr "Mota ezezaguneko laburtzapena: '%c'"
 msgid "Opening configuration file %s"
 msgstr "%s konfigurazio fitxategia irekitzen"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Sintaxi errorea %s:%u: Gaizki eratutako"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran"
@@ -2204,7 +2283,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Ezin da atzitu %s muntatze puntua"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ezin da %s(e)ra aldatu"
@@ -2241,143 +2320,153 @@ msgstr "Ezin izan da %s blokeoa hartu"
 msgid "Waited for %s but it wasn't there"
 msgstr "%s espero zen baina ez zegoen han"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s azpiprozesua ustekabean amaitu da"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Arazoa fitxategia ixtean"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Arazoa fitxategia desestekatzean"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Arazoa fitxategia sinkronizatzean"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Paketeen katxea hutsik"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Paketeen katxe fitxategia hondatuta dago"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Paketeen katxe fixategiaren bertsioa ez da bateragarria"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Mendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Aurremendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Iradokizuna:"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Gomendioa:"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Gatazka:"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Ordeztea:"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Zaharkitzea:"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Apurturik"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "garrantzitsua"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "beharrezkoa"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "estandarra"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "aukerakoa"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "estra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Dependentzia zuhaitza eraikitzen"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Hautagaien bertsioak"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Dependentzi Sormena"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Egoera argibideak irakurtzen"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
@@ -2466,7 +2555,7 @@ msgid ""
 msgstr ""
 "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2474,11 +2563,11 @@ msgstr ""
 "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
 "atxikitako paketeek eraginda."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2486,24 +2575,24 @@ msgstr ""
 "Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
 "zaharrak erabili dira haien ordez."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "%spartial zerrenda-direktorioa falta da."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "%spartial artxibo direktorioa falta da."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "%li fitxategia jasotzen %li-tik"
@@ -2518,17 +2607,17 @@ msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
 msgid "Method %s did not start correctly"
 msgstr "%s metodoa ez da behar bezala abiarazi"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
 
@@ -2549,16 +2638,18 @@ msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Ez da ulertu %s orratz-mota (pin)"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
 
@@ -2702,6 +2793,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Tamaina ez dator bat"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2760,6 +2868,12 @@ msgstr ""
 "%zu pakete indize, %zu jatorri indize %zu itzulpen indize eta %zu sinadura "
 "aurkitu dira\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2790,22 +2904,22 @@ msgstr "Jatorri zerrenda berria idazten\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Diskoarentzako jatorri sarrerak:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i erregistro grabaturik.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2816,12 +2930,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "%s Instalatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfiguratzen"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "%s kentzen"
@@ -2831,63 +2945,84 @@ msgstr "%s kentzen"
 msgid "Running post-installation trigger %s"
 msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' direktorioa falta da"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "%s prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s irekitzen"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfiguratzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "%s-ren abiarazleak prozesatzen"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s Instalatuta"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s kentzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s kendurik"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s guztiz ezabatzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago "
 "muntaturik?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ezin da zerrenda direktorioa blokeatu"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Ezin izan zaio fitxategiari adabakia ezarri"
@@ -2895,3 +3030,9 @@ msgstr "Ezin izan zaio fitxategiari adabakia ezarri"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Konexioa behar baino lehenago itxi da"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "%s-ren abiarazleak prozesatzen"
diff --git a/po/fi.po b/po/fi.po
index bffceef74..64e739401 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-05-04 19:30+0300\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,190 +17,148 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Pakettia %s ei löydy"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Pakettien kokonaismäärä : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Tavallisia paketteja: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Aitoja näennäispaketteja: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Yksinkertaisia näennäispaketteja: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Sekanäennäispaketteja: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Puuttuu: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Eri versioita yhteensä: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Eri kuvauksia yhteensä: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Riippuvuuksia yhteensä: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Versio/tdsto suhteita yht: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Kuvaus/tdsto suhteita yht: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Tarjoamiskuvauksia yhteensä: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Erilaisia merkkijonoja yhteensä: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Versioriippuvuustila yhteensä: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Löysää tilaa yhteensä: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Käytetty tila yhteensä: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakettitiedosto %s ei ole ajan tasalla."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "On annettava täsmälleen yksi lauseke"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Yhtään pakettia ei löytynyt"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Pakettitiedostot:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Paketit joissa tunniste:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(ei löydy)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Asennettu: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(ei mitään)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Ehdokas: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Paketin tunnistenumero: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Versiotaulukko:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
-#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -258,7 +216,7 @@ msgstr ""
 "   show - Näytä paketin tietue luettavassa muodossa\n"
 "   depends - Näytä paketin riippuvuustiedot käsittelemättömässä muodossa\n"
 "   rdepends - Näytä paketin käänteiset riippuvuudet\n"
-"   pkgnames - Luettele kaikkien pakettien nimet\n"
+"   pkgnames - Luettele järjestelmän kaikkien pakettien nimet\n"
 "   dotty - Tee paketeista graafit GraphViz-muodossa\n"
 "   xvcg - Tee paketeista graafit xvcg-muodossa\n"
 "   policy - Näytä mistä asennuspaketteja haetaan\n"
@@ -688,79 +646,79 @@ msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
 msgid "Failed to rename %s to %s"
 msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "K"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Käännösvirhe lausekkeessa - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "mutta %s on asennettu"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mutta %s on merkitty asennettavaksi"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "mutta ei ole asennuskelpoinen"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "mutta on näennäispaketti"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "mutta ei ole asennettu"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "mutta ei ole merkitty asennettavaksi"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " tai"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Seuraavat UUDET paketit asennetaan:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Seuraavat paketit POISTETAAN:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Nämä paketit on jätetty odottamaan:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Nämä paketit päivitetään:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Nämä paketit VARHENNETAAN:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Seuraavat pysytetyt paketit muutetaan:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (syynä %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -768,145 +726,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu päivitetty, %lu uutta asennusta, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu uudelleen asennettua, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu varhennettua, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, 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:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Korjataan riippuvuuksia..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " ei onnistunut."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Riippuvuuksien korjaus ei onnistu"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Päivitysjoukon minimointi ei onnistu"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Valmis"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Varoitus varmistamisesta on ohitettu.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Noutokansiota ei saatu lukittua"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Noudettavaa arkistoa %st/%st.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Noudettavaa arkistoa %st.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Kyllä, tee kuten käsketään!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -917,28 +875,28 @@ msgstr ""
 "Jatka kirjoittamalla \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Keskeytä."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Haluatko jatkaa [K/e]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Joidenkin tiedostojen nouto ei onnistunut"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Nouto on valmis ja määrätty vain nouto"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -946,47 +904,47 @@ msgstr ""
 "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai "
 "kokeile --fix-missing?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Puuttuvia paketteja ei voi korjata."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Asennus keskeytetään."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Huomautus, valitaan %s eikä %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Asennettu]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Yksi pitää valita asennettavaksi."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -997,54 +955,59 @@ msgstr ""
 "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n"
 "saatavilla vain jostain muusta lähteestä\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Paketilla %s ei ole asennettavaa valintaa"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Valittiin versio %s (%s) paketille %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Komento update ei käytä parametreja"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Luettelokansiota ei voitu lukita"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1052,11 +1015,11 @@ msgstr ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Poista ne komennolla \"apt-get autoremove\"."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1074,43 +1037,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Tehtävää %s ei löytynyt"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1118,7 +1081,7 @@ msgstr ""
 "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
 "ilmanpaketteja (tai ratkaise itse)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1129,116 +1092,116 @@ msgstr ""
 "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
 "vielä luotu tai siirretty Incoming-kansiosta."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Rikkinäiset paketit"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Ehdotetut paketit:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Suositellut paketit:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Käsitellään päivitystä ... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Ei onnistunut"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Valmis"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Sisäinen virhe, resolver rikkoi jotain"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "On noudettava %st lähdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Nouda lähdekoodi %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1246,7 +1209,7 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1255,32 +1218,33 @@ msgstr ""
 "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
 "ei vastaa versioriippuvuuksia"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1296,7 +1260,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1363,6 +1327,14 @@ msgstr ""
 "lisätietoja ja lisää valitsimia.\n"
 "                       This APT has Super Cow Powers.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Löytyi "
@@ -1594,9 +1566,9 @@ msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versi
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Tiedostoa %s ei voi lukea"
@@ -1830,7 +1802,7 @@ msgstr "Yhteys aikakatkaistiin"
 msgid "Server closed the connection"
 msgstr "Palvelin sulki yhteyden"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lukuvirhe"
 
@@ -1842,7 +1814,7 @@ msgstr "Vastaus aiheutti puskurin ylivuodon."
 msgid "Protocol corruption"
 msgstr "Yhteyskäytäntö on turmeltunut"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Virhe kirjoitettaessa"
 
@@ -1896,7 +1868,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
@@ -1980,41 +1952,41 @@ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Avainrengasta \"%s\" ei saatavilla"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2032,81 +2004,80 @@ msgstr "Putkea %s ei voitu avata"
 msgid "Read error from %s process"
 msgstr "Prosessi %s ilmoitti lukuvirheestä"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Odotetaan otsikoita"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Virheellinen otsikkorivi"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "HTTP-palvelimen arvoaluetuki on rikki"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Tuntematon päiväysmuoto"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Select ei toiminut"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
-#, fuzzy
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
-msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
+msgstr "Tiedoston typistäminen ei onnistunut"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
@@ -2119,11 +2090,38 @@ msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Ei voitu tehdä %lu tavun mmap:ia"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valintaa %s ei löydy"
@@ -2138,42 +2136,42 @@ msgstr "Tuntematon tyypin lyhenne: \"%c\""
 msgid "Opening configuration file %s"
 msgstr "Avataan asetustiedosto %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa"
@@ -2240,7 +2238,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Komento stat ei toiminut liitoskohdalle %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kansioon %s vaihto ei onnistu"
@@ -2274,143 +2272,153 @@ msgstr "Lukkoa %s ei saada"
 msgid "Waited for %s but it wasn't there"
 msgstr "Odotettiin %s, mutta sitä ei ollut"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Aliprosessi %s aiheutti suojausvirheen."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Aliprosessi %s palautti virhekoodin (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Aliprosessi %s lopetti odottamatta"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Pulmia tiedoston sulkemisessa"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Pulmia tehtäessä tiedostolle unlink"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Pulmia tehtäessä tiedostolle sync"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Pakettivarasto on tyhjä"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Pakettivarasto on turmeltunut"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Pakettivaraston versio on yhteensopimaton"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Pakettivarasto on tehty muulle arkkitehtuurille"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Riippuvuudet"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Esiriippuvuudet"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Ehdotukset"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Suosittelut"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Täydet korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Rikkoo"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "tärkeä"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "välttämätön"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "perus"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "valinnainen"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "ylimääräinen"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Muodostetaan riippuvuussuhteiden puu"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Mahdolliset versiot"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Luodaan riippuvuudet"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Luetaan tilatiedot"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Tilatiedoston %s avaaminen ei onnistunut"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
@@ -2497,7 +2505,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2505,11 +2513,11 @@ msgstr ""
 "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
 "paketit."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2517,24 +2525,24 @@ msgstr ""
 "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
 "käytetty vanhoja. "
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Luettelokansio %spartial puuttuu."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Arkistokansio %spartial puuttuu."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Noudetaan tiedosto %li / %li"
@@ -2549,17 +2557,17 @@ msgstr "Menetelmän ajuria %s ei löytynyt"
 msgid "Method %s did not start correctly"
 msgstr "Menetelmä %s ei käynnistynyt oikein"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 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:124
+#: 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:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
 
@@ -2581,16 +2589,18 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Tunnistetyyppi %s on tuntematon"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
 
@@ -2735,6 +2745,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Koko ei täsmää"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Huomautus, valitaan %s eikä %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2793,6 +2820,12 @@ msgstr ""
 "Hakemistoja löytyi: Asennuspakettien %zu, lähdekoodipakettien %zu, "
 "käännösten %zu ja allekirjoituksia löytyi %zu\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2823,22 +2856,22 @@ msgstr "Kirjoitetaan uusi lähdeluettelo\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Kirjoitettiin %i tietuetta.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2846,16 +2879,16 @@ msgstr ""
 "tiedostoa\n"
 
 #: apt-pkg/deb/dpkgpm.cc:49
-#, fuzzy, c-format
+#, c-format
 msgid "Installing %s"
-msgstr "%s asennettu"
+msgstr "Asennetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Tehdään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Poistetaan %s"
@@ -2863,65 +2896,86 @@ msgstr "Poistetaan %s"
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Running post-installation trigger %s"
-msgstr ""
+msgstr "Suoritetaan jälkiasennusliipaisin %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Kansio \"%s\" puuttuu."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Valmistellaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Puretaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Valmistaudutaan tekemään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Käsitellään %s:n liipaisimia"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s asennettu"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Valmistaudutaan poistamaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s poistettu"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Valmistaudutaan poistamaan %s kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts "
 "liittämättä?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Luettelokansiota ei voitu lukita"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Tiedostoa %s ei voitu avata"
@@ -2930,11 +2984,11 @@ msgstr "Tiedostoa %s ei voitu avata"
 msgid "Connection closed prematurely"
 msgstr "Yhteys katkesi ennenaikaisesti"
 
-#~ 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 ""
-#~ "Koska komennettiin vain yksi toimenpide, erittäin todennäköisesti\n"
-#~ "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
-#~ "tuosta paketista."
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Käsitellään %s:n liipaisimia"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Tila loppui kesken dynaamiselta MMap:lta"
diff --git a/po/fr.po b/po/fr.po
index 91099636a..af85ef43a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,207 +1,165 @@
-# translation of fr.po to French
 # translation of apt to French
 # Advanced Package Transfer - APT message translation catalog
 # French messages
 #
 # Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-12 22:42+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-07-21 23:33+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Nombre total de paquets : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Paquets ordinaires : "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Paquets entièrement virtuels : "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuels simples : "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuels mixtes : "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Manquants : "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Nombre de versions distinctes : "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Nombre de descriptions distinctes : "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Nombre de dépendances : "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Nombre de relations version/fichier : "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Nombre de relations description/fichier : "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Nombre de relations « Provides » : "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Nombre de motifs rationnels : "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Espace occupé par les versions des dépendances : "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Espace disque gaspillé : "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Total de l'espace attribué : "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Fichier %s désynchronisé."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Vous devez fournir exactement un motif"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Aucun paquet n'a été trouvé"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Fichiers du paquet :"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Paquets étiquetés :"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(non trouvé)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Installé : "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(aucun)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Candidat : "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Étiquette de paquet : "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr " Table de version :"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pour %s compilé sur %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -280,11 +238,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."
@@ -360,7 +320,8 @@ msgstr "Impossible d'écrire sur %s"
 
 #: cmdline/apt-extracttemplates.cc:310
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
+msgstr ""
+"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
 
 #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
 msgid "Package extension list is too long"
@@ -475,7 +436,8 @@ msgstr "Aucune sélection ne correspond"
 #: ftparchive/apt-ftparchive.cc:832
 #, 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:43
 #, c-format
@@ -694,79 +656,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "O"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erreur de compilation de l'expression rationnelle - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "mais %s est installé"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mais %s devra être installé"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "mais il n'est pas installable"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "mais c'est un paquet virtuel"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "mais il n'est pas installé"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "mais ne sera pas installé"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Les NOUVEAUX paquets suivants seront installés :"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Les paquets suivants seront ENLEVÉS :"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Les paquets suivants ont été conservés :"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Les paquets suivants seront mis à jour :"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Les paquets retenus suivants seront changés :"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (en raison de %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -775,137 +737,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu mis à jour, %lu nouvellement installés, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu réinstallés, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu remis à une version inférieure, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu à enlever et %lu non mis à jour.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu partiellement installés ou enlevés.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Correction des dépendances..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " a échoué."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Impossible de corriger les dépendances"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Impossible de minimiser le nombre des paquets mis à jour"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Fait"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Avertissement d'authentification ignoré.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Faut-il installer ces paquets sans vérification (o/N) ? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Certains paquets n'ont pas pu être authentifiés"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erreur interne. Le tri a été interrompu."
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le répertoire de téléchargement"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "La liste des sources ne peut être lue."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, 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:842
+#: cmdline/apt-get.cc:845
 #, 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:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n"
+msgstr ""
+"Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de déterminer l'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Pas assez d'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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 "
@@ -913,11 +877,11 @@ msgstr ""
 
 # The space before the exclamation mark must not be a non-breaking space; this
 # sentence is supposed to be typed by a user who cannot see the difference.
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Oui, faites ce que je vous dis !"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -928,28 +892,28 @@ msgstr ""
 "Pour continuer, tapez la phrase « %s »\n"
 " ?]"
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Annulation."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Souhaitez-vous continuer [O/n] ? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossible de récupérer %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu être téléchargés."
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 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:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -957,47 +921,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:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Impossible de corriger le fait que les paquets manquent."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Annulation de l'installation."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, 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:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Installé]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Vous devez explicitement sélectionner un paquet à installer."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1009,55 +974,61 @@ msgstr ""
 "devenu obsolète\n"
 "ou qu'il n'est disponible que sur une autre source\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Cependant les paquets suivants le remplacent :"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Aucun paquet ne correspond au paquet %s"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, 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:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "La version  « %s » de « %s » est introuvable"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, 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:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Version choisie %s (%s) pour %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n"
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "La commande de mise à jour ne prend pas d'argument"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Impossible de verrouiller le répertoire de liste"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Aucune suppression n'est sensée se produire : impossible de lancer "
 "« Autoremover »"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1065,11 +1036,11 @@ msgstr ""
 "Les paquets suivants ont été installés automatiquement et ne sont plus "
 "nécessaires :"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1088,43 +1059,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
+msgstr ""
+"Erreur interne, l'outil de suppression automatique a cassé quelque chose."
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Impossible de trouver la tâche %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s passé en « installé manuellement ».\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1132,7 +1104,7 @@ msgstr ""
 "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
 "(ou indiquez une solution)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1144,119 +1116,119 @@ 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:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Paquets défectueux"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Les paquets supplémentaires suivants seront installés : "
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Paquets suggérés :"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Paquets recommandés :"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Calcul de la mise à jour... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Échec"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Fait"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 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:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, 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:2147
+#: cmdline/apt-get.cc:2158
 #, 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:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Pas assez d'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, 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:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Récupération des sources %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Échec lors de la récupération de quelques archives."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de décompactage « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Échec du processus fils"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de dépendance de construction.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1265,7 +1237,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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1274,32 +1246,32 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dépendances de construction"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1315,7 +1287,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1356,7 +1328,7 @@ msgstr ""
 "  install - Installe de nouveaux paquets (pkg1 est libc6 et non libc6.deb)\n"
 "  remove - Supprime des paquets\n"
 "  autoremove - Supprime tous les paquets installés automatiquement\n"
-"  purge - Supprime et purge des paquets\n"
+"  purge - Supprime des paquets et leurs fichiers de configuration\n"
 "  source - Télécharge les archives de sources\n"
 "  build-dep - Configure build-dependencies pour les paquets sources\n"
 "  dist-upgrade - Met à jour la distribution, reportez-vous à apt-get(8)\n"
@@ -1384,6 +1356,20 @@ msgstr ""
 "apt.conf(5) pour plus d'informations et d'option.\n"
 "                      Cet APT a les « Super Cow Powers »\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+"NOTE: Ceci n'est qu'une simulation !\n"
+"      apt-get a besoin des privilèges du superutilisateur       pour pouvoir "
+"vraiment fonctionner.\n"
+"      Veuillez aussi noter que le verrouillage est désactivé,\n"
+"      et la situation n'est donc pas forcément représentative       de la "
+"réalité !"
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Atteint "
@@ -1480,7 +1466,8 @@ msgstr ""
 "seules les erreurs"
 
 #: dselect/install:104
-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."
@@ -1618,9 +1605,9 @@ msgstr "Écrase la correspondance de paquet sans version pour %s "
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossible de lire %s"
@@ -1843,7 +1830,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
@@ -1858,7 +1846,7 @@ msgstr "Dépassement du délai de connexion"
 msgid "Server closed the connection"
 msgstr "Le serveur a fermé la connexion"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Erreur de lecture"
 
@@ -1870,7 +1858,7 @@ msgstr "Une réponse a fait déborder le tampon."
 msgid "Protocol corruption"
 msgstr "Corruption du protocole"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Erreur d'écriture"
 
@@ -1880,7 +1868,8 @@ msgstr "Impossible de créer un connecteur"
 
 #: 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."
@@ -1924,7 +1913,7 @@ msgstr "Délai de connexion au port de données dépassé"
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problème de hachage du fichier"
 
@@ -2010,41 +1999,43 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "Impossible de se connecter à %s %s :"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Impossible d'accéder au porte-clés : « %s »"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 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:205
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+#: methods/gpgv.cc:223
+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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Au moins une signature non valable a été rencontrée."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossible d'exécuter « %s » pour contrôler la signature\n"
 "(veuillez vérifier si gpgv est installé)."
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Erreur inconnue à l'exécution de gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures suivantes ne sont pas valables :\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2062,80 +2053,80 @@ msgstr "Ne parvient pas à ouvrir le tube pour %s"
 msgid "Read error from %s process"
 msgstr "Erreur de lecture du processus %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Attente des fichiers d'en-tête"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Mauvaise ligne d'en-tête"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 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:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Ce serveur http possède un support des limites non-valide"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Format de date inconnu"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Sélection défaillante"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Délai de connexion dépassé"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Erreur d'écriture du fichier de sortie"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Erreur d'écriture sur un fichier"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Erreur d'écriture sur le fichier"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 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:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Échec de la troncature du fichier"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Mauvais en-tête de donnée"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Erreur interne"
 
@@ -2148,11 +2139,41 @@ msgstr "Impossible de mapper un fichier vide en mémoire"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "La zone dynamique d'allocation mémoire n'a plus de place"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"La zone dynamique d'allocation mémoire (« Dynamic MMap ») n'a plus de place. "
+"Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
+"actuelle est de %lu (voir « man 5 apt.conf »)."
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "La sélection %s n'a pu être trouvée"
@@ -2167,44 +2188,44 @@ msgstr "Type d'abréviation non reconnue : « %c »"
 msgid "Opening configuration file %s"
 msgstr "Ouverture du fichier de configuration %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Erreur syntaxique %s:%u : balise mal formée"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au "
 "niveau le plus haut"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
@@ -2271,7 +2292,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Impossible de localiser le point de montage %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossible d'accéder à %s"
@@ -2305,143 +2326,152 @@ msgstr "Impossible de verrouiller %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "A attendu %s mais il n'était pas présent"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Le sous-processus %s a commis une violation d'accès mémoire"
 
-#: apt-pkg/contrib/fileutl.cc:457
+#: apt-pkg/contrib/fileutl.cc:457, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Le sous-processus %s a reçu le signal %u"
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Le sous-processus %s s'est arrêté prématurément"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Impossible de verrouiller %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lu(s), %lu restant à lire, mais rien n'est disponible"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problème de fermeture du fichier"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problème d'effacement du fichier"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problème de synchronisation du fichier"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Cache des paquets vide"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Le fichier de cache des paquets est corrompu"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Le fichier de cache des paquets a une version incompatible"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Dépend"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Pré-Dépend"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Suggère"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Recommande"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Est en conflit avec"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Remplace"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Rend obsolète"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Casse"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr "Améliore"
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "nécessaire"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "optionnel"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "supplémentaire"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Construction de l'arbre des dépendances"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Versions possibles"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Génération des dépendances"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Lecture des informations d'état"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Impossible d'ouvrir le fichier d'état %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Erreur d'écriture du fichier d'état temporaire %s"
@@ -2474,12 +2504,14 @@ msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
 #: apt-pkg/sourcelist.cc:101
 #, 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:108
 #, 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:199
 #, c-format
@@ -2504,7 +2536,8 @@ msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources
 #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
 #, 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:428
 #, c-format
@@ -2525,12 +2558,13 @@ msgstr "Le type de fichier d'index « %s » n'est pas accepté"
 
 #: apt-pkg/algorithms.cc:248
 #, 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 il est impossible de trouver son "
 "archive."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2538,13 +2572,13 @@ 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:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
-"Impossible de corriger les problèmes, des paquets défecteux sont en mode "
+"Impossible de corriger les problèmes, des paquets défectueux sont en mode "
 "« garder en l'état »."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2552,24 +2586,24 @@ 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."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Le répertoire %spartial pour les listes n'existe pas."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Le répertoire d'archive %spartial n'existe pas."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Téléchargement du fichier %li sur %li (%s restant)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Téléchargement du fichier %li sur %li"
@@ -2584,19 +2618,19 @@ msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
 msgid "Method %s did not start correctly"
 msgstr "La méthode %s n'a pas démarré correctement"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
 "touche Entrée."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: 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"
 
@@ -2607,7 +2641,8 @@ msgstr "Impossible de localiser %s."
 
 #: apt-pkg/srcrecords.cc:44
 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:71
 msgid "The package lists or status file could not be parsed or opened."
@@ -2619,18 +2654,19 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
-"Enregistrement invalide dans votre fichier « préférences », aucune entrée "
+"Enregistrement non valable dans le fichier de préférences %s, aucune entrée "
 "« Package »."
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Étiquette %s inconnue"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette"
 
@@ -2735,7 +2771,8 @@ msgstr "Assemblage des fichiers listés dans les champs Provides"
 
 #: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
 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:127
 #, c-format
@@ -2760,9 +2797,8 @@ 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 ""
-"Impossible de localiser un fichier du paquet %s. Cela signifie "
-"que vous devrez corriger ce paquet vous-même (absence "
-"d'architecture)."
+"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
+"devrez corriger ce paquet vous-même (absence d'architecture)."
 
 #: apt-pkg/acquire-item.cc:1290
 #, c-format
@@ -2770,12 +2806,13 @@ msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
-"Impossible de localiser un fichier du paquet %s. Cela signifie "
-"que vous devrez corriger ce paquet vous-même."
+"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
+"devrez corriger ce paquet vous-même."
 
 #: apt-pkg/acquire-item.cc:1331
 #, 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."
@@ -2784,6 +2821,21 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Taille incohérente"
 
+#: apt-pkg/indexrecords.cc:40, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Impossible d'analyser le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:47, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Pas de sections dans le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Pas d'entrée de hachage dans le fichier Release %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2842,6 +2894,14 @@ msgstr ""
 "%zu index de paquets trouvés, %zu index de sources, %zu index de traductions "
 "et %zu signatures\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+"Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian ou "
+"bien l'architecture est-elle incorrecte."
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2872,22 +2932,22 @@ msgstr "Écriture de la nouvelle liste de sources\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Les entrées de listes de sources pour ce disque sont :\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i enregistrements écrits.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2899,12 +2959,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Installation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
@@ -2914,63 +2974,89 @@ msgstr "Suppression de %s"
 msgid "Running post-installation trigger %s"
 msgstr "Exécution des actions différées (« trigger ») de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Répertoire %s inexistant"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Préparation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Décompression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Préparation de la configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Traitement des déclencheurs (« triggers ») pour %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s installé"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Préparation de la suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Préparation de la suppression complète de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s complètement supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Impossible d'écrire le journal, échec d'openpty()\n"
 "(/dev/pts est-il monté ?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr "Exécution de dpkg"
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Impossible de verrouiller le répertoire d'administration (%s). Il est "
+"possible qu'un autre processus l'utilise."
+
+#: apt-pkg/deb/debsystem.cc:73, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les "
+"privilèges du superutilisateur ?"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+"dpkg a été interrompu. Il est nécessaire d'utiliser « dpkg --configure -a » "
+"pour corriger le problème."
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr "Non verrouillé"
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Impossible de corriger le fichier"
@@ -2979,3 +3065,11 @@ msgstr "Impossible de corriger le fichier"
 msgid "Connection closed prematurely"
 msgstr "Connexion fermée prématurément"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Traitement des déclencheurs (« triggers ») pour %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "La zone dynamique d'allocation mémoire n'a plus de place"
diff --git a/po/gl.po b/po/gl.po
index c30a6ebf1..75f29062c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,205 +1,167 @@
+# translation of apt_po_gl.po to galician
 # Galician translation of apt
 # This file is put in the public domain.
-# Jacobo Tarrío <jtarrio@debian.org>, 2005, 2007, 2008.
 #
+# Jacobo Tarrío <jtarrio@debian.org>, 2005, 2007, 2008.
+# mvillarino <mvillarino@users.sourceforge.net>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-07-28 22:28+0100\n"
-"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2008-12-17 22:44+0100\n"
+"Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
+"Language-Team: galician <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Non se puido atopar o paquete %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Número total de nomes de paquetes : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Paquetes normais: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuais puros: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuais simples: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuais mixtos: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Non atopados: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Número total de versións distintas: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Número total de descricións distintas: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Número total de dependencias: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Número total de relacións versión/ficheiro: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Número total de relacións descrición/ficheiro: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Número total de mapas de Provides: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Número total de cadeas: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Espazo total de versións de dependencias: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Espazo de reserva total: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Espazo total contabilizado: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro de paquete %s está sen sincronizar."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Debe fornecer exactamente un patrón"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Non se atopou ningún paquete"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Ficheiros de paquetes:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Paquetes inmobilizados:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(non se atopou)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(ningún)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Inmobilizado: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Táboa de versións:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado o %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
-#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -695,79 +657,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro na compilación da expresión regular - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "pero %s está instalado"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "pero hase instalar %s"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "pero non é instalable"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "pero é un paquete virtual"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "pero non está instalado"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "pero non se ha instalar"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Os seguintes paquetes NOVOS hanse instalar:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Os seguintes paquetes hanse ELIMINAR:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Os seguintes paquetes consérvanse:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Os seguintes paquetes hanse actualizar:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Os seguintes paquetes hanse DESACTUALIZAR:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Os seguintes paquetes retidos hanse modificar:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (debido a %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -775,144 +737,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualizados, %lu instalados, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizados, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu hanse eliminar e %lu sen actualizar.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non instalados ou eliminados de todo.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "A corrixir as dependencias..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " fallou."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Non se puido corrixir as dependencias."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Non se puido minimizar o xogo de actualizacións"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Rematado"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependencias incumpridas. Probe a empregar -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: ¡Non se poden autenticar os seguintes paquetes!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Ignórase o aviso de autenticación.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "¿Instalar estes paquetes sen verificación [s/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Non se puido autenticar algúns paquetes"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Houbo problemas e empregouse -y sen --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, chamouse a InstallPackages con paquetes rotos."
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, a ordeación non rematou"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Non se puido bloquear o directorio de descargas"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Non se puido ler a lista de orixes."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Hai que recibir %sB/%sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Hai que recibir %sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Despois desta operación hanse ocupar %sB de disco adicionais.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Despois desta operación hanse liberar %sB de disco.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non se puido determinar o espazo libre en %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "¡Si, fai o que digo!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -923,28 +885,28 @@ msgstr ""
 "Para continuar escriba a frase \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Abortar."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Quere continuar [S/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non se puido obter %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Non se puido descargar algúns ficheiros"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de só descargas"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -952,49 +914,49 @@ msgstr ""
 "Non se puido obter algúns arquivos; probe con apt-get update ou --fix-"
 "missing."
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Non se puido corrixir os paquetes non dispoñibles."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "A abortar a instalación."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Nota, escóllese %s no canto de %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Instalado]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Debería escoller un para instalar."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1005,66 +967,71 @@ msgstr ""
 "Isto pode significar que o paquete falla, está obsoleto ou só está\n"
 "dispoñible noutra fonte.\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Nembargantes, os seguintes paquetes substitúeno:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, 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:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Non se atopou a versión \"%s\" de \"%s\""
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Non se atopou a versión \"%s\" de \"%s\""
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Escolleuse a versión %s (%s) de %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "A orde \"update\" non toma argumentos"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Non se puido bloquear o directorio de listas"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non se supón que se deban eliminar cousas; non se pode iniciar o "
 "autoeliminador"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empregue \"apt-get autoremove\" para eliminalos."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1082,43 +1049,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro interno, o autoeliminador rompeu cousas"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade rompeu cousas"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Non se puido atopar a tarefa %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Non se puido atopar o paquete %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s cambiouse a instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1126,7 +1093,7 @@ msgstr ""
 "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
 "especifique unha solución)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1137,118 +1104,118 @@ 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:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Hanse instalar os seguintes paquetes extra:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Paquetes suxiridos:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualización... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Fallou"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Rematado"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o resolvedor interno rompeu cousas"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, 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:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, 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:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Non se puido recibir algúns arquivos."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a codificación de %s.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1257,7 +1224,7 @@ msgstr ""
 "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
 "o paquete %s"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1266,32 +1233,33 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Non se puido procesar as dependencias de compilación"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1307,7 +1275,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1378,6 +1346,14 @@ msgstr ""
 "máis información e opcións.\n"
 "                  Este APT ten Poderes de Supervaca.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Teño "
@@ -1608,9 +1584,9 @@ msgstr "Coincidencia na sobrescritura sen versión para %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Non se pode ler %s"
@@ -1843,7 +1819,7 @@ msgstr "Tempo esgotado para a conexión"
 msgid "Server closed the connection"
 msgstr "O servidor pechou a conexión"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Erro de lectura"
 
@@ -1855,7 +1831,7 @@ msgstr "Unha resposta desbordou o buffer."
 msgid "Protocol corruption"
 msgstr "Corrupción do protocolo"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Erro de escritura"
 
@@ -1910,7 +1886,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
 msgid "Unable to accept connection"
 msgstr "Non se pode aceptar a conexión"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
@@ -1994,43 +1970,43 @@ msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Non se pode conectar a %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Non se puido acceder ao chaveiro: \"%s\""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Sinatura correcta, pero non se puido determinar a pegada "
 "dixital da chave"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Atopouse alomenos unha sinatura non válida."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Non se puido executar \"%s\" para verificar a sinatura (¿está gpgv "
 "instalado?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Erro descoñecido ao executar gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes sinaturas non eran válidas:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2048,81 +2024,80 @@ msgstr "Non se puido abrir unha canle para %s"
 msgid "Read error from %s process"
 msgstr "Erro de lectura do proceso %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "A agardar polas cabeceiras"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Liña de cabeceira incorrecta"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP ten un soporte de rangos roto"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Formato de data descoñecido"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Erro ao escribir no ficheiro de saída"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Erro ao escribir nun ficheiro"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Erro ao escribir no ficheiro"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 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:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
-#, fuzzy
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
-msgstr "Non se puido gravar o ficheiro %s"
+msgstr "Non se puido truncar o ficheiro"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "A conexión fallou"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2135,11 +2110,38 @@ msgstr "Non se pode facer mmap sobre un ficheiro baleiro"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Non se puido facer mmap de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Non se atopou a selección %s"
@@ -2154,42 +2156,42 @@ msgstr "Abreviatura de tipo \"%c\" descoñecida"
 msgid "Opening configuration file %s"
 msgstr "A abrir o ficheiro de configuración %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Erro de sintaxe %s:%u: O bloque comeza sen un nome."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Erro de sintaxe %s:%u: Etiqueta mal formada"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Erro de sintaxe %s:%u: Lixo extra despois do valor"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Erro de sintaxe %s:%u: Só se poden facer directivas no nivel superior"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Erro de sintaxe %s:%u: Includes aniñados de máis"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Erro de sintaxe %s:%u: Incluído de aquí"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña"
@@ -2257,7 +2259,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Non se pode analizar o punto de montaxe %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Non se pode cambiar a %s"
@@ -2291,143 +2293,153 @@ msgstr "Non se puido obter o bloqueo %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Agardouse por %s pero non estaba alí"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "O subproceso %s recibiu un fallo de segmento."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "O subproceso %s recibiu un fallo de segmento."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "O subproceso %s devolveu un código de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O subproceso %s saíu de xeito inesperado"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Non se puido abrir o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escritura, aínda hai %lu para escribir pero non se puido"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problema ao pechar o ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problema ao borrar o ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problema ao sincronizar o ficheiro"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Caché de paquetes baleira"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "O ficheiro de caché de paquetes está corrompido"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "O ficheiro de caché de paquetes é unha versión incompatible"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "A caché de paquetes construiuse para unha arquitectura diferente"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Suxire"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Conflicto con"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Substitúe a"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Fai obsoleto a"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "requirido"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "A construír a árbore de dependencias"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Versións candidatas"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Xeración de dependencias"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "A ler a información do estado"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Non se puido abrir o ficheiro de estado %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Non se puido gravar o ficheiro de estado temporal %s"
@@ -2515,7 +2527,7 @@ msgid ""
 msgstr ""
 "O paquete %s ten que se reinstalar, pero non se pode atopar o seu arquivo."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2523,11 +2535,11 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve xerou interrupcións, pode estar causado "
 "por paquetes retidos."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2535,24 +2547,24 @@ msgstr ""
 "Non se puido descargar algúns ficheiros de índices; ignoráronse ou "
 "empregáronse uns vellos no seu lugar."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "O directorio de listas %spartial falla."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "O directorio de arquivos %spartial falla."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "A obter o ficheiro %li de %li (fallan %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "A obter o ficheiro %li de %li"
@@ -2567,17 +2579,17 @@ msgstr "Non se puido atopar o controlador de métodos %s."
 msgid "Method %s did not start correctly"
 msgstr "O método %s non se iniciou correctamente"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: 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"
 
@@ -2599,18 +2611,20 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Pode querer executar apt-get update para corrixir estes problemas"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira "
 "Package"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Non se entendeu o tipo de inmobilización %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
@@ -2756,6 +2770,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Os tamaños non coinciden"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Non se pode analizar o ficheiro de paquetes %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Nota, escóllese %s no canto de %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2814,6 +2845,12 @@ msgstr ""
 "Atopáronse %zu índices de paquetes, %zu índices de fontes, %zu índices de "
 "traducións e %zu sinaturas\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2844,22 +2881,22 @@ msgstr "A gravar a nova lista de fontes\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas da lista de fontes deste disco son:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Graváronse %i rexistros.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2871,12 +2908,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "A instalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "A configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "A eliminar %s"
@@ -2886,63 +2923,84 @@ msgstr "A eliminar %s"
 msgid "Running post-installation trigger %s"
 msgstr "A executar o disparador de post-instalación %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "O directorio \"%s\" falla"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempaquetar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A se preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "A procesar os disparadores de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Instalouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "A se preparar para a eliminación de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Eliminouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "A se preparar para eliminar %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Eliminouse %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Non se puido escribir no rexistro, a chamada a openpty() fallou (¿/dev/pts "
 "non estaba montado?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Non se puido bloquear o directorio de listas"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Non se puido parchear o ficheiro"
@@ -2951,55 +3009,11 @@ msgstr "Non se puido parchear o ficheiro"
 msgid "Connection closed prematurely"
 msgstr "A conexión pechouse prematuramente"
 
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "Liña %d longa de máis (máximo %lu)"
-
-#, fuzzy
-#~ msgid "Line %d too long (max %d)"
-#~ msgstr "Liña %d longa de máis (máximo %u)"
-
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc1)"
-#~ msgstr "Ocorreu un erro ao procesar %s (NewFileDesc1)"
-
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc2)"
-#~ msgstr "Ocorreu un erro ao procesar %s (NewFileDesc2)"
-
-#, fuzzy
-#~ msgid "Stored label: %s \n"
-#~ msgstr "Etiqueta armacenada: %s \n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
-#~ msgstr ""
-#~ "Atopáronse %u índices de paquetes, %u índices de fontes, %u índices de "
-#~ "traducións e %u sinaturas\n"
-
-#~ msgid "openpty failed\n"
-#~ msgstr "Fallou a chamada a openpty\n"
-
-#~ msgid "File date has changed %s"
-#~ msgstr "A data do ficheiro cambiou %s"
-
-#~ msgid "Reading file list"
-#~ msgstr "A ler a lista de paquetes"
-
-#~ msgid "Could not execute "
-#~ msgstr "Non se puido executar "
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
 
-#~ msgid "Preparing for remove with config %s"
-#~ msgstr "A se preparar para a eliminación con config %s"
+#~ msgid "Processing triggers for %s"
+#~ msgstr "A procesar os disparadores de %s"
 
-#~ msgid "Removed with config %s"
-#~ msgstr "Eliminouse con config %s"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "O MMap Dinámico esgotou o espazo"
diff --git a/po/he.po b/po/he.po
index ef7500eef..4e66faa54 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.25\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+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,153 +15,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "לחבילה %s בגרסה %s יש תלויות שלא נענו:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "לא מצליח לאתר את החבילה %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "חבילות נורמליות:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "חבילות וירטואליות לחלוטין:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "חסרות:"
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "קובץ החבילה %s לא מסונכרן."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "אתה חייב לתת בדיוק תבנית אחת"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "לא נמצאו חבילות"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "קבצי חבילה:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "חבילות נעוצות:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(לא נמצא)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "מותקן:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(none)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "מועמדים:"
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "נעץ חבילה:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s בשביל %s %s קומפל על %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -550,79 +545,79 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr "כשלון בשינוי השם %s ל-%s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "לחבילות הבאות יש תלויות שלא נענו:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "אבל %s מותקנת"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "אבל %s הולכת להיות מותקנת"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "אבל היא אינה ניתנת להתקנה"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "אבל היא חבילה וירטואלית"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "אבל היא לא מותקנת"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "אבל היא אינה הולכת להיות מותקנת"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr "או"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "החבילות הבאות יוסרו:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "החבילות הבאות מעובות:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "החבילות הבאות ישודרגו:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "החבילות הבאות ישודרגו מטה:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "החבילות המחוזקות הבאות ישונו:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (בגלל %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -631,144 +626,144 @@ msgstr ""
 "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n"
 "על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu משודרגים, %lu מותקנים חדשים, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu מותקנות מחדש, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu משודרגות מטה, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu יוסרו ו-%lu לא ישודרגו.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu לא מותקנות לחלוטין או הוסרו.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "מתקן תלויות..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr "כשלון."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "לא מצליח לתקן תלויות"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr "סיום"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "החבילות הבאות ישודרגו:"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "לא מצליח לנעול את ספרית ההורדה."
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "רשימת המקורות לא ניתנת לקריאה."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "צריך לקבל %sB/%sB מתוך הארכיונים.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "צריך לקבל %sB מתוך הארכיונים.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "אחרי פריסה %sB נוספים ישוחררו.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "אין לך מספיק מקום פנוי ב-%s."
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "אין לך מספיק מקום פנוי ב-%s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "כן, עשה כפי שאני אומר!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -776,75 +771,75 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "בטל."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "האם אתה רוצה להמשיך? [Y/n]"
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "כשלון בהבאת %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "כשלון בהורדת חלק מהקבצים"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr ""
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -852,64 +847,69 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -925,50 +925,50 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "שגיאה פנימית, כלשון ביצירת %s"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "אבל %s הולכת להיות מותקנת"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -976,153 +976,153 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "שגיאה פנימית, כלשון ביצירת %s"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, 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:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1138,7 +1138,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1166,6 +1166,14 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr ""
@@ -1381,9 +1389,9 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
@@ -1609,7 +1617,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr ""
 
@@ -1621,7 +1629,7 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr ""
 
@@ -1675,7 +1683,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1759,39 +1767,39 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr ""
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1807,81 +1815,81 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "כשלון בפענוח %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr ""
 
@@ -1894,11 +1902,38 @@ msgstr ""
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
@@ -1913,42 +1948,42 @@ msgstr ""
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -2015,7 +2050,7 @@ msgid "Unable to stat the mount point %s"
 msgstr ""
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
@@ -2049,143 +2084,152 @@ msgstr ""
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:457
 #, c-format
+msgid "Sub-process %s received signal %u."
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:460
+#, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "כשלון בפתיחת %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "כשלון בפענוח %s"
@@ -2269,40 +2313,40 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
@@ -2317,17 +2361,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2348,16 +2392,17 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
@@ -2495,6 +2540,22 @@ msgstr ""
 msgid "Size mismatch"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to open DB file %s: %s"
+msgid "Unable to parse Release file %s"
+msgstr "לא מצליח לפתוח את קובץ מסד הנתונים %s: %s"
+
+#: apt-pkg/indexrecords.cc:47
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2549,6 +2610,12 @@ msgid ""
 "zu signatures\n"
 msgstr ""
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2577,22 +2644,22 @@ msgstr ""
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2602,12 +2669,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "מותקן:"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr ""
@@ -2617,61 +2684,82 @@ msgstr ""
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "שגיאה בעיבוד ספריה %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "מותקן:"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the download directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "לא מצליח לנעול את ספרית ההורדה."
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""
@@ -2680,6 +2768,13 @@ msgstr ""
 msgid "Connection closed prematurely"
 msgstr ""
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "שגיאה בעיבוד ספריה %s"
+
 #, fuzzy
 #~ msgid "openpty failed\n"
 #~ msgstr "כשלון."
diff --git a/po/hu.po b/po/hu.po
index ea8ea9aae..d052a126f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-05-11 14:49+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian>\n"
@@ -19,191 +19,150 @@ msgstr ""
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Az alábbi csomag nem található: %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Csomagnevek összesen : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Normális csomagok: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Teljesen virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Egyedi virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Vegyes virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Hiányzik: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Különböző verziók összesen: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Összes külső leírás: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Függőségek összesen: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Verzió/Fájl kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Összes Leírás/Fájl kapcsolat: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "\"Előkészít\" kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Minták összesen: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Függőségi-verzió terület összesen: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Slack terület összesen: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Terület összesen: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "%s csomag fájl szinkronon kívül."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Pontosan egy mintát kell megadnod"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Nem találtam csomagokat"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Csomagfájlok:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Rögzített csomagok:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(nem találtam)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Telepítve: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(nincs)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Jelölt: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Csomag Tű: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Verziótáblázat:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s erre: %s ekkor fordult: %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -691,79 +650,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "I"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex fordítási hiba - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "de %s van telepítve"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "de csak %s telepíthető"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "de az nem telepíthető"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "de az egy virtuális csomag"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "de az nincs telepítve"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "de az nincs telepítésre megjelölve"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " vagy"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Az alábbi csomagok vissza lesznek tartva:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Az alábbi csomagok frissítve lesznek:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Az alábbi csomagok ÖREGBÍTÉSRE kerülnek:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Az alábbi visszafogott csomagokat cserélem:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s miatt) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -771,143 +730,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu frissített, %lu újonnan telepített, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu újratelepítendő, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu kerül öregbítésre, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, 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:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Függőségek javítása..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " sikertelen."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Nem lehet javítani a függőségeket"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Kész"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 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:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "A hitelesítési figyelmeztetést átléptem.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 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:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Néhány csomag nem hitelesíthető"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 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:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Belső hiba, a rendezés nem zárult"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Nem tudom zárolni a letöltési könyvtárat"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "A források listája olvashatatlan."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, 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:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Letöltés az archívumokból: %sB\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "E művelet után további %sB lemez-területetet használok fel.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "E művelet után %sB lemez-terület szabadul fel.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nem határozható meg a szabad hely itt: %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nincs elég szabad hely itt:  %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Igen, tedd amit mondok!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -918,28 +877,28 @@ msgstr ""
 "A folytatáshoz írd be ezt: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Megszakítva."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Folytatni akarod [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Sikertelen letöltés: %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Néhány fájlt nem sikerült letölteni"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 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:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -947,47 +906,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:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Nem lehet javítani a hiányzó csomagokat."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Telepítés megszakítása."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Megjegyzés: %s kiválasztása %s helyett\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Telepítve]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 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:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -997,63 +956,68 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "De az alábbi csomagok felváltják:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, 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:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s már a legújabb verzió.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%s' kiadás ehhez: '%s' nem található"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s' verzió ehhez: '%s' nem található"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Az update parancsnak nincsenek argumentumai"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Nem tudom a listakönyvtárat zárolni"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nincs törölnivaló, az AutoRemover nem indítható"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Töröld az 'apt-get autoremove' paranccsal!"
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1071,43 +1035,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Belső hiba, az AutoRemover sérült"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Belső hiba, AllUpgrade megsértett valamit"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Hiányzó %s feladat"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Az alábbi csomag nem található: %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s kézi telepítésre állított.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1115,7 +1079,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:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1127,118 +1091,118 @@ 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:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Törött csomagok"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Javasolt csomagok:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Ajánlott csomagok:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Frissítés kiszámítása... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Kész"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Belső hiba, hibafeloldó gond"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nem található forráscsomag ehhez: %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, 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:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nincs elég szabad hely itt: %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, 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:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Forrás letöltése: %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Nem sikerült néhány archívumot letölteni."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' kibontási parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s' elkészítési parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnál"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, 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:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1211,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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1220,33 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Nem sikerült az építési függőségeket feldolgozni"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1297,7 +1262,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1365,6 +1330,14 @@ msgstr ""
 "további információkért és opciókért.\n"
 "                   Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Találat "
@@ -1593,9 +1566,9 @@ msgstr "Csomagtalálat felülírása %s verziója nélkül"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s nem olvasható"
@@ -1827,7 +1800,7 @@ msgstr "Időtúllépés a kapcsolatban"
 msgid "Server closed the connection"
 msgstr "A kiszolgáló lezárta a kapcsolatot"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Olvasási hiba"
 
@@ -1839,7 +1812,7 @@ msgstr "A válasz túlcsordította a puffert."
 msgid "Protocol corruption"
 msgstr "Protokoll hiba"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Írási hiba"
 
@@ -1893,7 +1866,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt"
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 
@@ -1977,38 +1950,38 @@ msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Sikertelen kapcsolódás ide: %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "%s kulcstartó nem érhető el"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 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:205
+#: methods/gpgv.cc:223
 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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "1 vagy több érvénytelen aláírást találtam."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gpgv telepítve van?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Ismeretlen gpgv futtatási hiba"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2025,81 +1998,81 @@ msgstr "Nem lehet csövet nyitni ehhez: %s"
 msgid "Read error from %s process"
 msgstr "Olvasási hiba %s folyamattól"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Várakozás a fejlécekre"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Rossz fejléc sor"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 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:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Ez a http szerver támogatja a sérült tartományokat "
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Ismeretlen dátum formátum"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Sikertelen kiválasztás"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Hiba fájl írásakor"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 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:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "%s fájl írása sikertelen"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Rossz fejlécadat"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Belső hiba"
 
@@ -2113,11 +2086,38 @@ msgstr "Nem lehet mmap-olni egy üres fájlt"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Nem sikerült %lu bájtot mmap-olni"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s kiválasztás nem található"
@@ -2132,42 +2132,42 @@ msgstr "Ismeretlen típusrövidítés: '%c'"
 msgid "Opening configuration file %s"
 msgstr "%s konfigurációs fájl megnyitása"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik"
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Szintaktikai hiba %s: %u: hibás formátumú címke"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Szintaktikai hiba %s: %u: fölösleges szemét az érték után"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Szintaktikai hiba %s: %u: Csak legfelső szinten használhatók előírások"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előírás"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 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"
@@ -2235,7 +2235,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "%s csatolási pont nem érhető el"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nem sikerült ide váltani: %s"
@@ -2269,143 +2269,153 @@ msgstr "Nem sikerült zárolni: %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "%s nem volt itt, ahogy vártam"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s alfolyamat szegmentálási hibát okozott."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "%s alfolyamat szegmentálási hibát okozott."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s alfolyamat hibakóddal tért vissza (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s alfolyamat váratlanul kilépett"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nem lehet megnyitni %s fájlt"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "olvasás, még kellene %lu, de már az összes elfogyott"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "írás, még kiírandó %lu de ez nem lehetséges"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Hiba a fájl bezárásakor"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Hiba a fájl leválasztásával"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Hiba a fájl szinkronizálásakor"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Üres csomag-gyorstár"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "A csomag-gyorstár fájl megsérült"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "A csomag-gyorstár fájl inkompatibilis verziójú"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Függ ettől"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Függ ettől (előfüggés)"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Javasolja"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Ajánlja"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Ütközik"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Kicseréli"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Elavulttá teszi"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Töri"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "fontos"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "szükséges"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "szabványos"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opcionális"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Függőségi fa építése"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Lehetséges verziók"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Függőség-generálás"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Állapot adatok olvasása"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "%s állapot-fájl megnyitása sikertelen"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s átmeneti állapot-fájl írása sikertelen"
@@ -2493,7 +2503,7 @@ msgid ""
 msgstr ""
 "A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2501,12 +2511,12 @@ msgstr ""
 "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
 "csomagok okozhatják."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 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."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2514,24 +2524,24 @@ msgstr ""
 "Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi "
 "változatukat használom."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "%spartial listakönyvtár hiányzik."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "%spartial archívumkönyvtár hiányzik."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li/%li fájl letöltése (%s marad)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "%li/%li fájl letöltése"
@@ -2546,17 +2556,17 @@ msgstr "A(z) %s metódus vezérlő nem található."
 msgid "Method %s did not start correctly"
 msgstr "A(z) %s metódus nem indult el helyesen"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "A megfelelő csomagrendszer típus nem határozható meg"
 
@@ -2578,16 +2588,18 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Hibás rekord a tulajdonság fájlban, nincs csomagfejléc"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "A(z) %s tűtípus nem értelmezhető"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz"
 
@@ -2736,6 +2748,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "A méret nem megfelelő"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Megjegyzés: %s kiválasztása %s helyett\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2794,6 +2823,12 @@ msgstr ""
 "%zu csomag-indexet, %zu forrás-indexet, %zu fordítás-indexet és %zu aláírást "
 "találtam\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2824,22 +2859,22 @@ msgstr "Új forráslista írása\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i rekord kiírva.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, 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"
@@ -2849,12 +2884,12 @@ msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n"
 msgid "Installing %s"
 msgstr "Telepített %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfigurálása"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "%s eltávolítása"
@@ -2864,61 +2899,82 @@ msgstr "%s eltávolítása"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Hiányzik ez a könyvtár: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "%s előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s kicsomagolása"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfigurálásának előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Indítók feldolgozása ehhez: %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Telepített %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s eltávolításának előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Eltávolított %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s teljes eltávolítása előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s teljesen eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Naplózási hiba, sikertelen openpty() (a /dev/pts nincs csatolva?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nem tudom a listakönyvtárat zárolni"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "%s fájl foltozása sikertelen"
@@ -2927,6 +2983,12 @@ msgstr "%s fájl foltozása sikertelen"
 msgid "Connection closed prematurely"
 msgstr "A kapcsolat idő előtt lezárult"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Indítók feldolgozása ehhez: %s"
+
 #~ 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"
diff --git a/po/it.po b/po/it.po
index 2dc5595fe..c5293153d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,166 +1,164 @@
-# Advanced Package Transfer - APT message translation catalog
+# Italian translation of apt
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The Free Software Foundation, Inc.
+# This file is distributed under the same license as the apt package.
 # Samuele Giovanni Tonon <samu@debian.org>, 2002.
+# Milo Casagrande <milo@ubuntu.com>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.5.5\n"
+"Project-Id-Version: apt 0.7.20\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-14 12:19+0100\n"
-"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
-"Language-Team: Italian <it@li.org>\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-06-04 13:23+0200\n"
+"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Il pacchetto %s versione %s ha una dipendenza non soddisfatta:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Totale nomi dei pacchetti: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Pacchetti normali: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Pacchetti virtuali puri: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Pacchetti virtuali singoli: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Pacchetti virtuali misti: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Mancante: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Totale versioni distinte: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Totale descrizioni distinte: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Totale dipendenze: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Totale relazioni ver/file: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Totale relazioni Desc/File: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Totale corrispondenze fornite: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Totale stringhe globalizzate: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Totale spazio di dipendenza di versione: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
-msgstr "Totale spazio \"slack\": "
+msgstr "Totale spazio inutilizzato: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Totale spazio occupato: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
-msgstr "Il file dei pacchetti %s non � sincronizzato."
+msgstr "Il file dei pacchetti %s non è sincronizzato."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
-msgstr "Bisogna specificare unicamente un pattern"
+msgstr "È necessario specificare un solo modello"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Nessun pacchetto trovato"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "File dei pacchetti:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
+"La cache non è sincronizzata, impossibile referenziare un file di pacchetti"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
-msgstr "Pacchetti con pin:"
+msgstr "Pacchetti con gancio:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(non trovato)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Installato: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(nessuno)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
-msgstr "  Pin del pacchetto: "
+msgstr "  Gancio del pacchetto: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Tabella versione:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per %s compilato il %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -198,24 +196,25 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
-"Utilizzo: apt-cache [opzioni] comando\n"
-"        apt-cache [opzioni] add file1 [file2 ...]\n"
-"        apt-cache [opzioni] showpkg pkg1 [pkg2 ...]\n"
-"        apt-cache [opzioni] showsrc pkg1 [pkg2 ...]\n"
+"Uso: apt-cache [OPZIONI] COMANDO\n"
+"     apt-cache [OPZIONI] add FILE1 [FILE2 ...]\n"
+"     apt-cache [OPZIONI] showpkg PKG1 [PKG2 ...]\n"
+"     apt-cache [OPZIONI] showsrc PKG1 [PKG2 ...]\n"
 "\n"
-"apt-cache � un tool di basso livello usato per manipolare \n"
-"i file di cache dei binari di APT, e cercare informazioni in questi\n"
+"apt-cache è uno strumento di basso livello usato per manipolare \n"
+"i file di cache dei binari di APT e cercare informazioni in questi\n"
 "\n"
 "Comandi:\n"
-"   add - Aggiunge un file di pacchetti alla cache sorgente \n"
-"   gencaches - Costruisce sia la cache dei pacchetti che dei sorgenti\n"
+"   add - Aggiunge un file di pacchetti alla cache sorgente\n"
+"   gencaches - Costruisce sia la cache dei pacchetti sia quella dei "
+"sorgenti\n"
 "   showpkg - Mostra informazioni generali per un singolo pacchetto\n"
 "   showsrc - Mostra i campi dei sorgenti\n"
 "   stats - Mostra alcune statistiche di base\n"
 "   dump - Mostra il file in forma compatta\n"
-"   dumpavail - Stampa un file \"available\" in stdout\n"
+"   dumpavail - Stampa un file \"available\" sullo stdout\n"
 "   unmet - Mostra le dipendenze non soddisfatte\n"
-"   search - Cerca nella lista dei pacchetti la regex specificata\n"
+"   search - Cerca nell'elenco dei pacchetti un'espressione regolare\n"
 "   show - Mostra un campo leggibile per il pacchetto specificato\n"
 "   depends - Mostra informazioni di dipendenza per un pacchetto\n"
 "   rdepends - Mostra informazioni di dipendenza all'incontrario per un "
@@ -226,23 +225,23 @@ msgstr ""
 "   policy - Mostra le preferenze adottate\n"
 "\n"
 "Opzioni:\n"
-"  -h   Questo help.\n"
-"  -p=? la cache pacchetti.\n"
-"  -s=? la cache sorgenti.\n"
-"  -q   Disabilita l'indicatore di progresso\n"
+"  -h   Mostra questo aiuto\n"
+"  -p=? La cache dei pacchetti\n"
+"  -s=? La cache dei sorgenti\n"
+"  -q   Disabilita l'indicatore di avanzamento\n"
 "  -i   Mostra solo dipendenze importanti per il comando unmet\n"
 "  -c=? Legge come configurazione il file specificato\n"
 "  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
-"Consultare le pagine del manuale apt-cache(8) e apt.conf(5) per maggiori "
-"informazioni\n"
+"Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e "
+"apt.conf(5).\n"
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'"
+msgstr "Dare un nome a questo disco, tipo \"Debian 5.0 Disco 1\""
 
 #: cmdline/apt-cdrom.cc:93
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "Inserire un disco nel drive e premere invio"
+msgstr "Inserire un disco nell'unità e premere Invio"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -267,24 +266,23 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Utilizzo: apt-config [opzioni] comando\n"
+"Uso: apt-config [OPZIONI] COMANDO\n"
 "\n"
-"apt-config � un semplice programma per leggere il file di configurazione di "
-"APT\n"
+"apt-config è uno strumento per leggere il file di configurazione di APT\n"
 "\n"
 "Comandi:\n"
-"   shell - Modalit� shell\n"
+"   shell - Modalità shell\n"
 "   dump - Mostra la configurazione\n"
 "\n"
 "Opzioni\n"
-"  -h   Questo help.\n"
-"  -c=? Legge questo file di configurazione\n"
+"  -h   Mostra questo aiuto\n"
+"  -c=? Legge come configurazione il file specificato\n"
 "  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
 
 #: cmdline/apt-extracttemplates.cc:98
 #, c-format
 msgid "%s not a valid DEB package."
-msgstr "%s non � un pacchetto DEB valido."
+msgstr "%s non è un pacchetto DEB valido."
 
 #: cmdline/apt-extracttemplates.cc:232
 msgid ""
@@ -299,13 +297,13 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Utilizzo: apt-extracttemplates file1 [file2 ...]\n"
+"Uso: apt-extracttemplates FILE1 [FILE2 ...]\n"
 "\n"
-"apt-extracttemplates � un tool per estrarre configurazioni e template\n"
+"apt-extracttemplates è uno strumento per estrarre configurazioni e template\n"
 "dai pacchetti debian\n"
 "\n"
 "Opzioni:\n"
-"  -h   Questo help.\n"
+"  -h   Mostra questo aiuto\n"
 "  -t   Imposta la directory temporanea\n"
 "  -c=? Legge come configurazione il file specificato\n"
 "  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
@@ -317,31 +315,31 @@ msgstr "Impossibile scrivere in %s"
 
 #: cmdline/apt-extracttemplates.cc:310
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Impossibile trovare una versione di debconf. Debconf � installato?"
+msgstr "Impossibile trovare la versione di debconf. È installato?"
 
 #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
 msgid "Package extension list is too long"
-msgstr "L'estensione del pacchetto � troppo lunga"
+msgstr "L'elenco dell'estensione del pacchetto è troppo lungo"
 
 #: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
 #: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
 #: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
 #, c-format
 msgid "Error processing directory %s"
-msgstr "Errore durante l'analisi della directory %s"
+msgstr "Errore nell'elaborare la directory %s"
 
 #: ftparchive/apt-ftparchive.cc:251
 msgid "Source extension list is too long"
-msgstr "L'estensione del sorgente � troppo lunga"
+msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
 
 #: ftparchive/apt-ftparchive.cc:368
 msgid "Error writing header to contents file"
-msgstr "Errore nella scrittura dell'header nel file contents"
+msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
 
 #: ftparchive/apt-ftparchive.cc:398
 #, c-format
 msgid "Error processing contents %s"
-msgstr "Errore nell'analisi dei contents %s"
+msgstr "Errore nell'analisi dei \"contents\" %s"
 
 #: ftparchive/apt-ftparchive.cc:553
 msgid ""
@@ -384,46 +382,45 @@ msgid ""
 "  -c=?  Read this configuration file\n"
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
-"Utilizzo: apt-ftparchive [opzioni] comando\n"
-"Comandi: packages pathaibinari [filedioverride [pathprefix]\n"
-"          sources pathaisorgenti [filedioverride [pathprefix]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [gruppi]\n"
-"          clean config\n"
+"Uso: apt-ftparchive [OPZIONI] COMANDO\n"
+"Comandi: packages PERCORSO_AL_BINARIO [FILE_OVERRIDE [PREFISSO_PERCORSO]\n"
+"         sources PERCORSO_AI_SORGENTI [FILE_OVERRIDE [PREFISSO_PERCORSO]\n"
+"         contents PERCORSO\n"
+"         release PERCORSO\n"
+"         generate CONFIGURAZIONE [GRUPPI]\n"
+"         clean CONFIGURAZIONE\n"
 "\n"
 "apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n"
-"molti stili di generazione da completamente automatici a alternative\n"
+"molti stili di generazione da completamente automatici ad alternative\n"
 "funzionali per dpkg-scanpackages e dpkg-scansources\n"
 "\n"
-"apt-ftparchive genera file Packages da un albero di .deb. Il\n"
-"file Package contiene le informazioni di tutti i campi control da ogni\n"
-"pacchetto cos� come l'hash MD5 e la dimensione del file. Un file override\n"
-"� supportato per forzare il valore di Priorit� e Sezione.\n"
+"apt-ftparchive genera file Packages da un albero di \".deb\". Il file\n"
+"Package contiene le informazioni di tutti i campi control da ogni\n"
+"pacchetto, così come l'hash MD5 e la dimensione del file. Un file override\n"
+"è supportato per forzare i valori di priorità e sezione.\n"
 "\n"
-"Similarmente apt-ftparchive genera file Sources da un albero di .dscs.\n"
-"L'opzione --source-override pu� essere usata per specificare un file\n"
+"Similmente, apt-ftparchive genera file Sources da un albero di .dscs.\n"
+"L'opzione --source-override può essere usata per specificare un file\n"
 "di override per i sorgenti\n"
 "\n"
-"I comandi 'packages' e 'sources' devono essere eseguiti nella root \n"
-"dell'albero. BinaryPath deve puntare alla base della ricerca \n"
+"I comandi \"packages\" e \"sources\" devono essere eseguiti nella root \n"
+"dell'albero. Il percorso al binario deve puntare alla base della ricerca \n"
 "ricorsiva e il file override deve contenere le opzioni di override.\n"
-"Pathprefix �\n"
-" aggiunto al campo filename se presente. Esempio di utilizzo \n"
-"dall'archivio debian:\n"
+"Il prefisso del percorso è aggiunto al campo filename se presente. Esempio\n"
+"di utilizzo dall'archivio Debian:\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
 "               dists/potato/main/binary-i386/Packages \n"
 "\n"
 "Opzioni:\n"
-"  -h    Questo help\n"
-"  --md5 Controlla la generazione del MD5\n"
-"  -s=?  File override dei sorgenti\n"
-"  -q    Silenzioso\n"
-"  -d=?  Seleziona il database di cache opzionale\n"
-"  --no-delink Abilita modalit� di debug del delinking\n"
-"  --contents  Controlla la generazione del file contents\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione arbitraria di configurazione"
+"  -h          Mostra questo aiuto\n"
+"  --md5       Controlla la generazione dell'MD5\n"
+"  -s=?        File override dei sorgenti\n"
+"  -q          Silenzioso\n"
+"  -d=?        Seleziona il database di cache opzionale\n"
+"  --no-delink Abilita la modalità di debug del delinking\n"
+"  --contents  Controlla la generazione del file \"contents\"\n"
+"  -c=?        Legge come configurazione il file specificato\n"
+"  -o=?        Imposta un'opzione arbitraria di configurazione"
 
 #: ftparchive/apt-ftparchive.cc:759
 msgid "No selections matched"
@@ -432,54 +429,57 @@ msgstr "Nessuna selezione corrisponde"
 #: ftparchive/apt-ftparchive.cc:832
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "Mancano alcuni file nel file group di pacchetti `%s'"
+msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
 
 #: ftparchive/cachedb.cc:43
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB era corrotto, il file � stato rinominato in %s.old"
+msgstr "Il database era danneggiato, il file è stato rinominato in %s.old"
 
 #: ftparchive/cachedb.cc:61
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
-msgstr "Il DB � vecchio, tentativo di aggiornamento %s"
+msgstr "Il database è vecchio, tentativo di aggiornamento %s"
 
 #: ftparchive/cachedb.cc:72
 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."
+"Il formato del database non è valido. Se è stata aggiornata una vecchia "
+"versione di apt, rimuovere e ricreare il database."
 
 #: ftparchive/cachedb.cc:77
 #, c-format
 msgid "Unable to open DB file %s: %s"
-msgstr "Impossibile aprire il file DB %s: %s"
+msgstr "Impossibile aprire il file del database %s: %s"
 
 #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
 #, c-format
 msgid "Failed to stat %s"
-msgstr "Impossibile analizzare %s"
+msgstr "Impossibile eseguire stat su %s"
 
 #: ftparchive/cachedb.cc:238
 msgid "Archive has no control record"
-msgstr "L'archivio non ha un campo control"
+msgstr "L'archivio non ha un campo \"control\""
 
 #: ftparchive/cachedb.cc:444
 msgid "Unable to get a cursor"
 msgstr "Impossibile ottenere un cursore"
 
+# (ndt) messo A per Avviso
+# Inizio con la maiuscola dopo i : perché mi sa che in molti
+# casi molte stringhe sono così
 #: ftparchive/writer.cc:76
 #, c-format
 msgid "W: Unable to read directory %s\n"
-msgstr "W: Impossibile leggere la directory %s\n"
+msgstr "A: Impossibile leggere la directory %s\n"
 
 #: ftparchive/writer.cc:81
 #, c-format
 msgid "W: Unable to stat %s\n"
-msgstr "W: Impossibile analizzare %s\n"
+msgstr "A: Impossibile eseguire stat su %s\n"
 
 #: ftparchive/writer.cc:132
 msgid "E: "
@@ -487,54 +487,54 @@ msgstr "E: "
 
 #: ftparchive/writer.cc:134
 msgid "W: "
-msgstr "W: "
+msgstr "A: "
 
 #: ftparchive/writer.cc:141
 msgid "E: Errors apply to file "
-msgstr "E: Errori applicati al file "
+msgstr "E: Gli errori si applicano al file "
 
 #: ftparchive/writer.cc:158 ftparchive/writer.cc:188
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "Impossibile risolvere %s"
+msgstr "Risoluzione di %s non riuscita"
 
 #: ftparchive/writer.cc:170
 msgid "Tree walking failed"
-msgstr "Visita dell'albero fallita"
+msgstr "Visita dell'albero non riuscita"
 
 #: ftparchive/writer.cc:195
 #, c-format
 msgid "Failed to open %s"
-msgstr "Impossibile aprire %s"
+msgstr "Apertura di %s non riuscita"
 
 #: ftparchive/writer.cc:254
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgstr " Delink %s [%s]\n"
 
 #: ftparchive/writer.cc:262
 #, c-format
 msgid "Failed to readlink %s"
-msgstr "Impossibile eseguire readlink su %s"
+msgstr "Esecuzione di readlink su %s non riuscita"
 
 #: ftparchive/writer.cc:266
 #, c-format
 msgid "Failed to unlink %s"
-msgstr "Impossibile eseguire unlink su %s"
+msgstr "Esecuzione di unlink su %s non riuscita"
 
 #: ftparchive/writer.cc:273
 #, c-format
 msgid "*** Failed to link %s to %s"
-msgstr "*** Impossibile eseguire link tra %s e %s"
+msgstr "*** Collegamento di %s a %s non riuscito"
 
 #: ftparchive/writer.cc:283
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink limite di %sB raggiunto.\n"
+msgstr " Raggiunto il limite di Delink di %sB.\n"
 
 #: ftparchive/writer.cc:387
 msgid "Archive had no package field"
-msgstr "L'archivio non ha un campo package"
+msgstr "L'archivio non ha un campo \"package\""
 
 #: ftparchive/writer.cc:395 ftparchive/writer.cc:610
 #, c-format
@@ -544,7 +544,7 @@ msgstr "  %s non ha un campo override\n"
 #: ftparchive/writer.cc:440 ftparchive/writer.cc:698
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s maintainer � %s non %s\n"
+msgstr "  il responsabile di %s è %s non %s\n"
 
 #: ftparchive/writer.cc:620
 #, c-format
@@ -554,16 +554,16 @@ msgstr "  %s non ha un campo source override\n"
 #: ftparchive/writer.cc:624
 #, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr "  %s non ha neppure un campo binary override\n"
+msgstr "  %s non ha neppure un campo binario override\n"
 
 #: ftparchive/contents.cc:321
 #, c-format
 msgid "Internal error, could not locate member %s"
-msgstr "Errore interno, impossibile trovare il campo %s"
+msgstr "Errore interno, impossibile trovare il membro %s"
 
 #: ftparchive/contents.cc:358 ftparchive/contents.cc:389
 msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Impossibile allocare memoria"
+msgstr "realloc - Allocazione della memoria non riuscita"
 
 #: ftparchive/override.cc:34 ftparchive/override.cc:142
 #, c-format
@@ -573,27 +573,27 @@ msgstr "Impossibile aprire %s"
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format
 msgid "Malformed override %s line %lu #1"
-msgstr "Override malformato %s linea %lu #1"
+msgstr "Override non corretto: file %s riga %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format
 msgid "Malformed override %s line %lu #2"
-msgstr "Override malformato %s linea %lu #2"
+msgstr "Override non corretto: file %s riga %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format
 msgid "Malformed override %s line %lu #3"
-msgstr "Override malformato %s linea %lu #3"
+msgstr "Override non corretto: file %s riga %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
 msgid "Failed to read the override file %s"
-msgstr "Impossibile leggere il file override %s"
+msgstr "Lettura del file override %s non riuscita"
 
 #: ftparchive/multicompress.cc:72
 #, c-format
 msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo di compressione '%s' sconosciuto"
+msgstr "Algoritmo di compressione \"%s\" sconosciuto"
 
 #: ftparchive/multicompress.cc:102
 #, c-format
@@ -602,15 +602,15 @@ msgstr "L'output compresso %s necessita di un insieme di compressione"
 
 #: ftparchive/multicompress.cc:169 methods/rsh.cc:91
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "Impossibile creare un pipe IPC verso il sottoprocesso"
+msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita"
 
 #: ftparchive/multicompress.cc:195
 msgid "Failed to create FILE*"
-msgstr "Impossibile creare FILE*"
+msgstr "Creazione di FILE* non riuscita"
 
 #: ftparchive/multicompress.cc:198
 msgid "Failed to fork"
-msgstr "Impossibile eseguire fork"
+msgstr "Fork non riuscita"
 
 #: ftparchive/multicompress.cc:212
 msgid "Compress child"
@@ -619,15 +619,15 @@ msgstr "Sottoprocesso compresso"
 #: ftparchive/multicompress.cc:235
 #, c-format
 msgid "Internal error, failed to create %s"
-msgstr "Errore interno, impossibile creare %s"
+msgstr "Errore interno, creazione di %s non riuscita"
 
 #: ftparchive/multicompress.cc:286
 msgid "Failed to create subprocess IPC"
-msgstr "Impossibile creare un sottoprocesso IPC"
+msgstr "Creazione di un sottoprocesso IPC non riuscita"
 
 #: ftparchive/multicompress.cc:321
 msgid "Failed to exec compressor "
-msgstr "Impossibile eseguire compressor"
+msgstr "Esecuzione di compressor non riuscita"
 
 #: ftparchive/multicompress.cc:360
 msgid "decompressor"
@@ -635,11 +635,11 @@ msgstr "decompressore"
 
 #: ftparchive/multicompress.cc:403
 msgid "IO to subprocess/file failed"
-msgstr "I/O al sottoprocesso/file fallito"
+msgstr "I/O al sottoprocesso/file non riuscito"
 
 #: ftparchive/multicompress.cc:455
 msgid "Failed to read while computing MD5"
-msgstr "Impossibile leggere durante l'elaborazione MD5"
+msgstr "Lettura durante l'elaborazione MD5 non riuscita"
 
 #: ftparchive/multicompress.cc:472
 #, c-format
@@ -649,390 +649,397 @@ msgstr "Problema nell'unlink di %s"
 #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "Impossibile rinominare %s in %s"
+msgstr "Rinomina di %s in %s non riuscita"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
-msgstr "Errore di compilazione della regex - %s"
+msgstr "Errore di compilazione dell'espressione regolare - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
-msgstr "ma %s � installato"
+msgstr "ma %s è installato"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ma %s sta per essere installato"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
-msgstr "ma non � installabile"
+msgstr "ma non è installabile"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
-msgstr "ma � un pacchetto virtuale"
+msgstr "ma è un pacchetto virtuale"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
-msgstr "ma non � installato"
+msgstr "ma non è installato"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "ma non sta per essere installato"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " oppure"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
-msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:"
+msgstr "I seguenti pacchetti NUOVI saranno installati:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "I seguenti pacchetti saranno RIMOSSI:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "I seguenti pacchetti saranno aggiornati:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
-msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):"
+msgstr "I seguenti pacchetti saranno RETROCESSI:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "I seguenti pacchetti bloccati saranno cambiati:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (a causa di %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"ATTENZIONE: il seguente pacchetto ESSENZIALE sta per essere rimosso\n"
+"ATTENZIONE: i seguenti pacchetti essenziali stanno per essere rimossi.\n"
 "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
-"si sta facendo!"
+"si sta facendo."
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aggiornati, %lu installati, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstallati, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
-msgstr "%lu retrocessi (downgraded), "
+msgstr "%lu retrocessi, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu da rimuovere e %lu non aggiornati.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non completamente installati o rimossi.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
-msgstr "Correzione delle dipendenze in corso..."
+msgstr "Correzione delle dipendenze..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
-msgstr " fallita."
+msgstr " non riuscita."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Impossibile correggere le dipendenze"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Impossibile minimizzare l'insieme da aggiornare"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Fatto"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
-"� consigliabile eseguire `apt-get -f install' per correggere questi problemi."
+"È utile eseguire \"apt-get -f install\" per correggere questi problemi."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dipendenze non trovate. Riprovare usando -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!"
+msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
-msgstr "Avviso di autenticazione disabilitato \n"
+msgstr "Avviso di autenticazione disabilitato.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
-msgstr "Installare questi pacchetti senza la verifica [s/N]? "
+msgstr "Installare questi pacchetti senza verificarli [s/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
-msgstr "Non � stato possibile autenticare alcuni pacchetti"
+msgstr "Alcuni pacchetti non possono essere autenticati"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
-msgstr "Sussistono dei problemi e -y � stata usata senza --force-yes"
+msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
-"Errore interno, InstallPackages � stato chiamato con un pacchetto rotto!"
+"Errore interno, InstallPackages è stato chiamato con un pacchetto "
+"danneggiato."
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
-msgstr "I pacchetti devono essere rimossi ma il remove � disabilitato."
+msgstr ""
+"I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
-msgstr "Errore interno, l'ordinamento non � terminato"
+msgstr "Errore interno, l'ordinamento non è stato terminato"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
-msgstr "Impossibile creare un lock sulla directory di download"
+msgstr "Impossibile bloccare la directory di scaricamento"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
-msgstr "La lista dei sorgenti non pu� essere letta."
+msgstr "Impossibile leggere l'elenco dei sorgenti."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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"
+"Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
-msgstr "� necessario prendere %sB/%sB di archivi. \n"
+msgstr "È necessario scaricare %sB/%sB di archivi.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
-msgstr "� necessario prendere %sB di archivi. \n"
+msgstr "È necessario scaricare %sB di archivi.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossibile determinare lo spazio libero su %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
-msgstr "Lo spazio libero in %s non � sufficiente."
+msgstr "Spazio libero in %s insufficiente."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
-"� stata specificata la modalit� Trivial Only ma questa non � un'operazione "
-"triviale"
+"È stata specificata la modalità \"Trivial Only\", ma questa non è "
+"un'operazione banale."
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
-msgstr "SI, esegui come richiesto!"
+msgstr "Sì, esegui come da richiesta."
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
-"Si sta per compiere un'azione potenzialmente pericolosa\n"
-"Per continuare scrivere la frase '%s' \n"
+"Si sta per compiere un'azione potenzialmente pericolosa.\n"
+"Per continuare scrivere la frase \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Interrotto."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Continuare [S/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr "Impossibile ottenere %s  %s\n"
+msgstr "Impossibile recuperare %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
-msgstr "Il download di alcuni file � fallito"
+msgstr "Scaricamento di alcuni file non riuscito"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
-msgstr "Download completato e in modalit� download-only"
+msgstr "Scaricamento completato e in modalità solo scaricamento"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"Impossibile prendere alcuni archivi, forse � meglio eseguire apt-get update "
-"o provare l'opzione --fix-missing"
+"Impossibile recuperare alcuni pacchetti. Potrebbe essere utile eseguire "
+"\"apt-get update\" o provare l'opzione \"--fix-missing\"."
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing su media estraibili non � ancora supportato"
+msgstr "--fix-missing su supporti estraibili non è ancora supportato"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
-msgstr "Impossibile correggere i pacchetti mancanti"
+msgstr "Impossibile correggere i pacchetti mancanti."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
-msgstr "Interruzione dell'installazione in corso."
+msgstr "Interruzione dell'installazione."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
-msgstr "Nota, si sta selezionando %s al posto di %s\n"
+msgstr "Nota, viene selezionato %s al posto di %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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"
+"Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
-msgstr "Il pacchetto %s non � installato, quindi non � stato rimosso\n"
+msgstr "Il pacchetto %s non è installato e quindi non è stato rimosso\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
-msgstr "Il pacchetto %s � un pacchetto virtuale fornito da:\n"
+msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Installato]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
-msgstr "Bisogna esplicitamente sceglierne uno da installare."
+msgstr "È necessario sceglierne uno da installare."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 msgstr ""
-"Il pacchetto %s non ha versioni disponibili, ma � nominato da un altro\n"
-"pacchetto. Questo significa che il pacchetto manca, � diventato obsoleto\n"
-"o � disponibile solo all'interno di un'altra sorgente\n"
+"Il pacchetto %s non ha versioni disponibili, ma è nominato da un altro\n"
+"pacchetto. Questo significa che il pacchetto manca, è diventato obsoleto\n"
+"oppure è disponibile solo all'interno di un'altra sorgente\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Tuttavia questi pacchetti lo sostituiscono:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Il pacchetto %s non ha candidati da installare"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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"
+msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
-msgstr "%s � gi� alla versione pi� recente.\n"
+msgstr "%s è già alla versione più recente.\n"
 
-#: cmdline/apt-get.cc:1193
+# (ndt) dovrebbe essere inteso il file Release
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
-msgstr "Non � stata trovata la release '%s' per '%s'"
+msgstr "Release \"%s\" per \"%s\" non trovato."
 
-#: cmdline/apt-get.cc:1195
+# (ndt) dovrebbe essere inteso il Version
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
-msgstr "Non � stata trovata la versione '%s' per '%s'"
+msgstr "Version \"%s\" per \"%s\" non trovato"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
-msgstr "Versione selezionata %s (%s) per %s\n"
+msgstr "Versione %s (%s) selezionata per %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "Nessun pacchetto sorgente \"%s\", selezionato \"%s\" al suo posto\n"
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Il comando update non accetta argomenti"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
-msgstr "Impossibile creare un lock sulla directory di list"
+msgstr "Impossibile bloccare la directory"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
-"Non siamo autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
+"Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
-"I seguenti pacchetti erano stati automaticamente installati e non sono pi� "
+"I seguenti pacchetti sono stati installati automaticamente e non sono più "
 "richiesti:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
-msgstr "Usare 'apt-get autoremove' per rimuoverli."
+msgstr "Usare \"apt-get autoremove\" per rimuoverli."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
-"Hmm, sembra che AutoRemover abbia distrutto qualcosa e questo\n"
-"non dovrebbe accadere. Si prega di compilare un bug report per apt."
+"Sembra che AutoRemover abbia rovinato qualcosa e questo\n"
+"non doveva accadere. Segnalare un bug riguardo apt."
 
 #.
 #. if (Packages == 1)
@@ -1044,217 +1051,260 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Errore interno, AutoRemover ha dato problemi"
+msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
+msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Impossibile trovare il task %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
-msgstr "Impossibile trovare %s"
+msgstr "Impossibile trovare il pacchetto %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Nota, si sta selezionando %s per la regex '%s'\n"
+msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
-msgstr "%s impostato per installazione manuale.\n"
+msgstr "È stato impostato %s per l'installazione manuale.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
-"� consigliabile eseguire 'apt-get -f install' per correggere questi problemi:"
+"È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
-"specificare una soluzione)."
+"Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
+"(o specificare una soluzione)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""
-"Alcuni pacchetti non possono essere installati. Questo pu� voler\n"
-"dire che � stata richiesta una situazione impossibile oppure, se\n"
-"si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n"
-"richiesti non sono ancora stati creati o rimossi da incoming."
+"Alcuni pacchetti non possono essere installati. Questo può voler dire\n"
+"che è stata richiesta una situazione impossibile oppure, se si sta\n"
+"usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
+"non sono ancora stati creati o sono stati rimossi da Incoming."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
-msgstr "Pacchetto non integro"
+msgstr "Pacchetto danneggiato"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
-msgstr "I seguenti pacchetti verranno inoltre installati:"
+msgstr "I seguenti pacchetti saranno inoltre installati:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Pacchetti suggeriti:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Pacchetti raccomandati:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
-msgstr "Calcolo dell'aggiornamento in corso... "
+msgstr "Calcolo dell'aggiornamento... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
-msgstr "Fallito"
+msgstr "Non riuscito"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
-msgstr "Fatto"
+msgstr "Eseguito"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Errore interno, problem resolver ha rotto qualcosa"
+msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
-msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente"
+msgstr ""
+"È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossibile trovare un pacchetto sorgente per %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "Si � saltato il file gi� scaricato '%s'\n"
+msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "Lo spazio libero in %s non � sufficiente"
+msgstr "Lo spazio libero in %s è insufficiente"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "� necessario prendere %sB/%sB di sorgenti.\n"
+msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "� necessario prendere %sB di sorgenti\n"
+msgstr "È necessario recuperare %sB di sorgenti\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
-msgstr "Prelievo del sorgente %s\n"
+msgstr "Recupero sorgente %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
-msgstr "Non � stato possibile scaricare alcuni archivi."
+msgstr "Recupero di alcuni archivi non riuscito."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Si � saltata l'estrazione del sorgente gi� estratto in %s\n"
+msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
-msgstr "Comando di estrazione '%s' fallito.\n"
+msgstr "Comando di estrazione \"%s\" non riuscito.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Verificare se il pacchetto 'dpkg-dev' � installato.\n"
+msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
-msgstr "Comando di costruzione '%s' fallito.\n"
+msgstr "Comando \"%s\" di generazione non riuscito.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
-msgstr "Processo figlio fallito"
+msgstr "Creazione processo figlio non riuscita"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
-"Bisogna specificare almeno un pacchetto di cui controllare la generazione di "
-"dipendenze"
+"È necessario specificare almeno un pacchetto di cui controllare le "
+"dipendenze di generazione"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
-msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s"
+msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
-msgstr "%s non ha dipendenze di costruzione.\n"
+msgstr "%s non ha dipendenze di generazione.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
-"%s dipendenze per %s non possono essere soddisfatte perch� non si trova il "
-"pacchetto %s"
+"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
+"non può essere trovato"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
-"%s dipendenze per %s non possono essere soddisfatte perch� nessuna versione "
-"del pacchetto %s pu� soddisfare le richieste di versione"
+"%s dipendenze per %s non possono essere soddisfatte perché nessuna versione "
+"del pacchetto %s può soddisfare le richieste di versione"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, 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"
+"La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
+"è troppo nuovo"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "La dipendenza %s per %s: %s � fallita"
+msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Non � stato possibile soddisfare le dipendenze di costruzione per %s."
+msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
-msgstr "Il calcolo delle dipendenze per la costruzione � fallito"
+msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
+#| msgid ""
+#| "Usage: apt-get [options] command\n"
+#| "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+#| "       apt-get [options] source pkg1 [pkg2 ...]\n"
+#| "\n"
+#| "apt-get is a simple command line interface for downloading and\n"
+#| "installing packages. The most frequently used commands are update\n"
+#| "and install.\n"
+#| "\n"
+#| "Commands:\n"
+#| "   update - Retrieve new lists of packages\n"
+#| "   upgrade - Perform an upgrade\n"
+#| "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+#| "   remove - Remove packages\n"
+#| "   autoremove - Remove automatically all unused packages\n"
+#| "   purge - Remove and purge packages\n"
+#| "   source - Download source archives\n"
+#| "   build-dep - Configure build-dependencies for source packages\n"
+#| "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+#| "   dselect-upgrade - Follow dselect selections\n"
+#| "   clean - Erase downloaded archive files\n"
+#| "   autoclean - Erase old downloaded archive files\n"
+#| "   check - Verify that there are no broken dependencies\n"
+#| "\n"
+#| "Options:\n"
+#| "  -h  This help text.\n"
+#| "  -q  Loggable output - no progress indicator\n"
+#| "  -qq No output except for errors\n"
+#| "  -d  Download only - do NOT install or unpack archives\n"
+#| "  -s  No-act. Perform ordering simulation\n"
+#| "  -y  Assume Yes to all queries and do not prompt\n"
+#| "  -f  Attempt to correct a system with broken dependencies in place\n"
+#| "  -m  Attempt to continue if archives are unlocatable\n"
+#| "  -u  Show a list of upgraded packages as well\n"
+#| "  -b  Build the source package after fetching it\n"
+#| "  -V  Show verbose version numbers\n"
+#| "  -c=? Read this configuration file\n"
+#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+#| "pages for more information and options.\n"
+#| "                       This APT has Super Cow Powers.\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1270,7 +1320,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1297,56 +1347,66 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Utilizzo: apt-get [opzioni] comando\n"
-"        apt-get [opzioni] install|remove pkg1 [pkg2 ...]\n"
-"        apt-get [opzioni] source pkg1 [pkg2 ...]\n"
+"Uso: apt-get [OPZIONI] COMANDO\n"
+"     apt-get [OPZIONI] install|remove PKG1 [PKG2 ...]\n"
+"     apt-get [OPZIONI] source PKG1 [PKG2 ...]\n"
 "\n"
-"apt-get � una semplice interfaccia a linea di comando per scaricare \n"
-"e installare pacchetti. I comandi pi� usati sono update \n"
-"e install.\n"
+"apt-get è una semplice interfaccia a riga di comando per scaricare \n"
+"e installare pacchetti. I comandi più usati sono update e install.\n"
 "\n"
 "Comandi:\n"
-"   update - Scarica la nuova lista di pacchetti\n"
+"   update - Scarica l'elenco aggiornato dei pacchetti\n"
 "   upgrade - Esegue un aggiornamento dei pacchetti installati\n"
-"   install - Installa nuovi pacchetti (il pkg � libc6 non libc6.deb)\n"
-"   remove - Rimuove pacchetti\n"
-"   autoremove - Rimuove automaticamente pacchetti inutilizzati\n"
-"   purge - Rimuove completamente i pacchetti\n"
+"   install - Installa nuovi pacchetti (PKG è libc6 non libc6.deb)\n"
+"   remove - Rimuove i pacchetti\n"
+"   autoremove - Rimuove automaticamente i pacchetti inutilizzati\n"
+"   purge - Rimuove i pacchetti e la loro configurazione\n"
 "   source - Scarica i pacchetti sorgente\n"
 "   build-dep - Configura le dipendenze di compilazione per i pacchetti "
 "sorgente\n"
-"   dist-upgrade - Aggiornamento della distribuzione, vedere apt-get(8)\n"
+"   dist-upgrade - Esegue un avanzamento della distribuzione, consultare apt-"
+"get(8)\n"
 "   dselect-upgrade - Segue le selezioni di dselect\n"
-"   clean - Cancella l'archivio temporaneo dei pacchetti scaricati \n"
-"   autoclean - Cancella vecchi archivi temporanei di pacchetti scaricati\n"
+"   clean - Elimina i file dei pacchetti scaricati\n"
+"   autoclean - Elimina i vecchi pacchetti scaricati\n"
 "   check - Verifica che non ci siano dipendenze insoddisfatte\n"
 "\n"
 "Opzioni:\n"
-"  -h  Questo help.\n"
-"  -q  Output registrabile - nessun indicatore di progresso\n"
-"  -qq Nessun output eccetto per gli errori\n"
-"  -d  Solamente download - NON installa o decomprime gli archivi\n"
-"  -s  Nessuna azione. Simula i passi in ordine\n"
-"  -y  Assume s� a tutte le domande e non chiede conferma\n"
-"  -f  Tenta di continuare se il controllo di integrit� fallisce\n"
-"  -m  Tenta di continuare se gli archivi non si trovano\n"
-"  -u  Mostra una lista dei pacchetti da aggiornare\n"
-"  -b  Costruisce il pacchetto sorgente dopo averlo scaricato\n"
-"  -V  Mostra dettagliatamente i numeri di versione\n"
+"  -h  Mostra questo aiuto\n"
+"  -q  Output registrabile, nessun indicatore di avanzamento\n"
+"  -qq Nessun output eccetto gli errori\n"
+"  -d  Scarica solamente, NON installa o decomprime gli archivi\n"
+"  -s  Nessuna azione, simula i passi in ordine\n"
+"  -y  Assume una risposta affermativa a tutte le domande e non chiede "
+"conferma\n"
+"  -f  Tenta di continuare se il controllo di integrità non riesce\n"
+"  -m  Tenta di continuare se gli archivi non sono localizzabili\n"
+"  -u  Mostra un elenco dei pacchetti aggiornati\n"
+"  -b  Genera il pacchetto sorgente dopo averlo recuperato\n"
+"  -V  Mostra prolissamente i numeri di versione\n"
 "  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n"
-"Consultare le pagine apt-get(8), sources.list(5) e apt.conf(5) del manuale\n"
-"per maggiori informazioni e opzioni.\n"
-"                       Questo APT ha i Poteri della Super Mucca.\n"
+"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
+"Per maggiori informazioni e opzioni, consultare le pagine di manuale\n"
+"apt-get(8), sources.list(5) e apt.conf(5).\n"
+"                       Questo APT ha i poteri della Super Mucca.\n"
+
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
 
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
-msgstr "Hit "
+msgstr "Trovato "
 
 #: cmdline/acqprogress.cc:79
 msgid "Get:"
-msgstr "Get:"
+msgstr "Scaricare:"
 
+# (ndt) questa non so cosa voglia dire
 #: cmdline/acqprogress.cc:110
 msgid "Ign "
 msgstr "Ign "
@@ -1358,12 +1418,12 @@ msgstr "Err "
 #: cmdline/acqprogress.cc:135
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Scaricato %sB in %s (%sB/s)\n"
+msgstr "Recuperati %sB in %s (%sB/s)\n"
 
 #: cmdline/acqprogress.cc:225
 #, c-format
 msgid " [Working]"
-msgstr " [In corso]"
+msgstr " [In lavorazione]"
 
 #: cmdline/acqprogress.cc:271
 #, c-format
@@ -1372,13 +1432,13 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
-"Cambio disco: Inserire il disco chiamato\n"
-" '%s'\n"
-"nel dispositivo '%s' e premere invio\n"
+"Cambio disco: inserire il disco chiamato\n"
+" \"%s\"\n"
+"nel dispositivo \"%s\" e premere Invio\n"
 
 #: cmdline/apt-sortpkgs.cc:86
 msgid "Unknown package record!"
-msgstr "Campo del pacchetto sconosciuto!"
+msgstr "Record del pacchetto sconosciuto."
 
 #: cmdline/apt-sortpkgs.cc:150
 msgid ""
@@ -1393,54 +1453,55 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Utilizzo: apt-sortpkgs [opzioni] file1 [file2 ...]\n"
+"Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n"
 "\n"
-"apt-sortpkgs � un semplice tool per ordinare il file dei pacchetti. "
-"L'opzione -s\n"
-"� usata per indicare che tipo di file �.\n"
+"apt-sortpkgs è uno strumento per ordinare i file dei pacchetti.\n"
+"L'opzione -s è usata per indicare il tipo di file.\n"
 "\n"
 "Opzioni:\n"
-"  -h   Questo help\n"
+"  -h   Mostra questo aiuto\n"
 "  -s   Ordina per pacchetto sorgente\n"
 "  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n"
+"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
 
 #: dselect/install:32
 msgid "Bad default setting!"
-msgstr "Opzione predefinita errata!"
+msgstr "Impostazione predefinita errata."
 
 #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
 #: dselect/install:105 dselect/update:45
 msgid "Press enter to continue."
-msgstr "Premere invio per continuare."
+msgstr "Premere Invio per continuare."
 
 #: dselect/install:91
 msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "Cancellare tutti i file deb precedentemente scaricati?"
+msgstr "Eliminare tutti i file .deb precedentemente scaricati?"
 
 # Note to translators: The following four messages belong together. It doesn't
 # matter where sentences start, but it has to fit in just these four lines, and
 # at only 80 characters per line, if possible.
 #: dselect/install:101
 msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "Si sono verificati alcuni errori nella scompattazione. Si cercher� di "
+msgstr ""
+"Si sono verificati alcuni errori nell'estrazione. Verrà tentato di "
+"configurare "
 
 #: dselect/install:102
 msgid "packages that were installed. This may result in duplicate errors"
 msgstr ""
-"configurare i pacchetti che sono stati installati. Questo potrebbe generare "
+"i pacchetti che sono stati installati. Questo potrebbe generare molteplici "
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr ""
-"errori duplicati o errori causati da dipendenze non soddisfatte. Questo va "
+"errori o errori causati da dipendenze mancanti. Questo non causa problemi, "
 
 #: dselect/install:104
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
-" bene solo se gli errori sopra questo messaggio sono importanti. Si prega "
-"di  correggerli e di eseguire [I]nstall un'altra volta"
+"gli errori precedenti sono importanti. Correggerli e rieseguire "
+"l'installazione"
 
 #: dselect/update:30
 msgid "Merging available information"
@@ -1448,24 +1509,24 @@ msgstr "Aggiornamento delle informazioni disponibili"
 
 #: apt-inst/contrib/extracttar.cc:114
 msgid "Failed to create pipes"
-msgstr "Impossibile creare delle pipe"
+msgstr "Creazione delle pipe non riuscita"
 
 #: apt-inst/contrib/extracttar.cc:141
 msgid "Failed to exec gzip "
-msgstr "Impossibile eseguire gzip "
+msgstr "Esecuzione di gzip non riuscita"
 
 #: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
 msgid "Corrupted archive"
-msgstr "Archivio corrotto"
+msgstr "Archivio danneggiato"
 
 #: apt-inst/contrib/extracttar.cc:193
 msgid "Tar checksum failed, archive corrupted"
-msgstr "Checksum di tar fallito, archivio corrotto"
+msgstr "Checksum di tar non riuscito, archivio danneggiato"
 
 #: apt-inst/contrib/extracttar.cc:296
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
-msgstr "Tipo %u nell'header del tar sconosciuto, member %s"
+msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
 
 #: apt-inst/contrib/arfile.cc:70
 msgid "Invalid archive signature"
@@ -1473,19 +1534,19 @@ msgstr "Firma dell'archivio non valida"
 
 #: apt-inst/contrib/arfile.cc:78
 msgid "Error reading archive member header"
-msgstr "Errore nella lettura del member header dell'archivio"
+msgstr "Errore nel leggere l'intestazione member dell'archivio"
 
 #: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
 msgid "Invalid archive member header"
-msgstr "Member header dell'archivio non valido"
+msgstr "Intestazione member dell'archivio non valida"
 
 #: apt-inst/contrib/arfile.cc:128
 msgid "Archive is too short"
-msgstr "L'archivio � troppo corto"
+msgstr "L'archivio è troppo piccolo"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Failed to read the archive headers"
-msgstr "Impossibile leggere gli header dell'archivio"
+msgstr "Lettura delle intestazioni dell'archivio non riuscita"
 
 #: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
@@ -1493,11 +1554,11 @@ msgstr "Dropnode invocata su un nodo ancora collegato"
 
 #: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
-msgstr "Impossibile localizzare l'elemento hash!"
+msgstr "Localizzazione dell'elemento hash non riuscita."
 
 #: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
-msgstr "Impossibile allocare la deviazione"
+msgstr "Allocazione della deviazione non riuscita"
 
 #: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
@@ -1506,8 +1567,7 @@ msgstr "Errore interno in AddDiversion"
 #: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
-"Tentativo di sovrascrittura di una deviazione in corso, %s -> %s e %s/%s"
+msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s"
 
 #: apt-inst/filelist.cc:506
 #, c-format
@@ -1517,42 +1577,42 @@ msgstr "Doppia aggiunta di deviazione %s -> %s"
 #: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
-msgstr "File di configurazione duplice %s/%s"
+msgstr "File di configurazione duplicato %s/%s"
 
 #: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
 #, c-format
 msgid "Failed to write file %s"
-msgstr "Impossibile scrivere il file %s"
+msgstr "Scrittura del file %s non riuscita"
 
 #: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
 #, c-format
 msgid "Failed to close file %s"
-msgstr "Chiusura del file %s fallita"
+msgstr "Chiusura del file %s non riuscita"
 
 #: apt-inst/extract.cc:93 apt-inst/extract.cc:164
 #, c-format
 msgid "The path %s is too long"
-msgstr "Il path %s � troppo lungo"
+msgstr "Il percorso %s è troppo lungo"
 
 #: apt-inst/extract.cc:124
 #, c-format
 msgid "Unpacking %s more than once"
-msgstr "Estrazione di %s eseguita pi� di una volta"
+msgstr "Estrazione di %s eseguita più di una volta"
 
 #: apt-inst/extract.cc:134
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "La directory %s � deviata"
+msgstr "La directory %s è deviata"
 
 #: apt-inst/extract.cc:144
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
-"Il pacchetto sta cercando di scrivere nella deviazione di destinazione %s/%s"
+"Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s"
 
 #: apt-inst/extract.cc:154 apt-inst/extract.cc:297
 msgid "The diversion path is too long"
-msgstr "Il path della deviazione � troppo lungo"
+msgstr "Il percorso della deviazione è troppo lungo"
 
 #: apt-inst/extract.cc:240
 #, c-format
@@ -1561,11 +1621,11 @@ msgstr "La directory %s sta per essere sostituita da una non-directory"
 
 #: apt-inst/extract.cc:280
 msgid "Failed to locate node in its hash bucket"
-msgstr "Impossibile localizzare il nodo nel suo hash bucket"
+msgstr "Localizzazione del nodo nel suo hash bucket non riuscita"
 
 #: apt-inst/extract.cc:284
 msgid "The path is too long"
-msgstr "Il path � troppo lungo"
+msgstr "Il percorso è troppo lungo"
 
 #: apt-inst/extract.cc:414
 #, c-format
@@ -1577,9 +1637,9 @@ msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossibile leggere %s"
@@ -1587,12 +1647,12 @@ msgstr "Impossibile leggere %s"
 #: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
-msgstr "Impossibile analizzare %s"
+msgstr "Impossibile eseguire stat su %s"
 
 #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
 #, c-format
 msgid "Failed to remove %s"
-msgstr "Impossibile rimuovere %s"
+msgstr "Rimozione di %s non riuscita"
 
 #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
 #, c-format
@@ -1602,32 +1662,32 @@ msgstr "Impossibile creare %s"
 #: apt-inst/deb/dpkgdb.cc:114
 #, c-format
 msgid "Failed to stat %sinfo"
-msgstr "Impossibile analizzare %sinfo"
+msgstr "Esecuzione di stat su %sinfo non riuscita"
 
 #: apt-inst/deb/dpkgdb.cc:119
 msgid "The info and temp directories need to be on the same filesystem"
-msgstr "Le directory temp e info devono essere sullo stesso filesystem"
+msgstr "Le directory temp e info devono essere sullo stesso file system"
 
 #. Build the status cache
 #: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
 #: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
 #: apt-pkg/pkgcachegen.cc:957
 msgid "Reading package lists"
-msgstr "Lettura della lista dei pacchetti in corso"
+msgstr "Lettura elenco dei pacchetti"
 
 #: apt-inst/deb/dpkgdb.cc:176
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
-msgstr "Impossibile raggiungere la directory admin %sinfo"
+msgstr "Cambio della directory admin %sinfo non riuscito"
 
 #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
 #: apt-inst/deb/dpkgdb.cc:444
 msgid "Internal error getting a package name"
-msgstr "Errore interno nel prendere un nome di un pacchetto"
+msgstr "Errore interno nel recuperare un nome di un pacchetto"
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
 msgid "Reading file listing"
-msgstr "Lettura della lista dei file in corso"
+msgstr "Lettura elenco dei file"
 
 #: apt-inst/deb/dpkgdb.cc:212
 #, c-format
@@ -1636,37 +1696,37 @@ msgid ""
 "then make it empty and immediately re-install the same version of the "
 "package!"
 msgstr ""
-"Impossibile aprire file di lista '%sinfo%s'. Se non si pu� ripristinare "
-"questo file allora crearne uno vuoto e reinstallare immediatamente la stessa "
-"versione del pacchetto!"
+"Impossibile aprire il file dell'elenco \"%sinfo/%s\". Se non è possibile "
+"ripristinarlo, crearne uno vuoto e reinstallare immediatamente la stessa "
+"versione del pacchetto."
 
 #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
-msgstr "Errore nella lettura del file di lista %sinfo%s"
+msgstr "Lettura del file dell'elenco %sinfo/%s non riuscita"
 
 #: apt-inst/deb/dpkgdb.cc:262
 msgid "Internal error getting a node"
-msgstr "Errore interno nel prendere un nodo"
+msgstr "Errore interno nel recuperare un nodo"
 
 #: apt-inst/deb/dpkgdb.cc:305
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
-msgstr "Impossibile aprire il file di diversion %sdiversions"
+msgstr "Apertura del file di deviazione %sdiversions non riuscita"
 
 #: apt-inst/deb/dpkgdb.cc:320
 msgid "The diversion file is corrupted"
-msgstr "Il file di diversion � corrotto"
+msgstr "Il file di diversion è danneggiato"
 
 #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
 #: apt-inst/deb/dpkgdb.cc:337
 #, c-format
 msgid "Invalid line in the diversion file: %s"
-msgstr "Linea non valida nel file di diversion: %s"
+msgstr "Riga non valida nel file di diversion: %s"
 
 #: apt-inst/deb/dpkgdb.cc:358
 msgid "Internal error adding a diversion"
-msgstr "Errore interno nell'aggiunta di una diversion"
+msgstr "Errore interno nell'aggiungere una deviazioni"
 
 #: apt-inst/deb/dpkgdb.cc:379
 msgid "The pkg cache must be initialized first"
@@ -1675,57 +1735,58 @@ msgstr "La cache dei pacchetti deve prima essere inizializzata"
 #: apt-inst/deb/dpkgdb.cc:439
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
-msgstr "Impossibile trovare un Pacchetto: header, offset %lu"
+msgstr "Impossibile trovare un Package: header, offset %lu"
 
 #: apt-inst/deb/dpkgdb.cc:461
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Sezione ConfFile nel file status non corretta. Offset %lu"
+msgstr "Sezione ConfFile nel file di stato non corretta. Offset %lu"
 
 #: apt-inst/deb/dpkgdb.cc:466
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
-msgstr "Errore nel parsing MD5. Offset %lu"
+msgstr "Errore nell'analisi MD5. Offset %lu"
 
 #: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Questo non � un archivio DEB valido, member '%s' mancante"
+msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante"
 
 #: apt-inst/deb/debfile.cc:50
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "Questo non � un valido file DEB, campi '%s', '%s' o '%s' mancanti"
+msgstr ""
+"Questo non è un archivio DEB valido: membri \"%s\", \"%s\" o \"%s\" mancanti"
 
 #: apt-inst/deb/debfile.cc:110
 #, c-format
 msgid "Couldn't change to %s"
-msgstr "Impossibile cambiare su %s"
+msgstr "Impossibile passare a %s"
 
 #: apt-inst/deb/debfile.cc:140
 msgid "Internal error, could not locate member"
-msgstr "Errore interno, impossibile localizzare il campo"
+msgstr "Errore interno, impossibile localizzare il membro"
 
 #: apt-inst/deb/debfile.cc:173
 msgid "Failed to locate a valid control file"
-msgstr "Impossibile localizzare un file control valido"
+msgstr "Impossibile localizzare un file \"control\" valido"
 
 #: apt-inst/deb/debfile.cc:258
 msgid "Unparsable control file"
-msgstr "File control non corretto"
+msgstr "File \"control\" non analizzabile"
 
 #: methods/cdrom.cc:114
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr "Impossibile leggere il database del cdrom %s"
+msgstr "Impossibile leggere il database del CD-ROM %s"
 
 #: methods/cdrom.cc:123
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
-"Si prega di usare apt-cdrom per far riconoscere questo CD-ROM da APT. apt-"
-"get update non pu� essere usato per aggiungere nuovi CD-ROM"
+"Usare apt-cdrom per far riconoscere questo CD-ROM da APT. apt-get update non "
+"può essere usato per aggiungere nuovi CD-ROM"
 
 #: methods/cdrom.cc:131
 msgid "Wrong CD-ROM"
@@ -1747,15 +1808,15 @@ msgstr "File non trovato"
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
 #: methods/rred.cc:234 methods/rred.cc:243
 msgid "Failed to stat"
-msgstr "Impossibile analizzare"
+msgstr "Esecuzione di stat non riuscita"
 
 #: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
 msgid "Failed to set modification time"
-msgstr "Impossibile impostare la data di modifica (modification time)"
+msgstr "Impostazione della data di modifica non riuscita"
 
 #: methods/file.cc:44
 msgid "Invalid URI, local URIS must not start with //"
-msgstr "URI non valide, le URI locali non devono iniziare con //"
+msgstr "URI non valido, gli URI locali non devono iniziare con //"
 
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc:162
@@ -1764,7 +1825,7 @@ msgstr "Accesso in corso"
 
 #: methods/ftp.cc:168
 msgid "Unable to determine the peer name"
-msgstr "Impossibile determinare il nome del peer"
+msgstr "Impossibile determinare il nome del nodo"
 
 #: methods/ftp.cc:173
 msgid "Unable to determine the local name"
@@ -1773,45 +1834,46 @@ msgstr "Impossibile determinare il nome locale"
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
 msgid "The server refused the connection and said: %s"
-msgstr "Il server ha rifiutato la connessione e ha detto: %s"
+msgstr "Il server ha rifiutato la connessione e riporta: %s"
 
 #: methods/ftp.cc:210
 #, c-format
 msgid "USER failed, server said: %s"
-msgstr "USER fallito, il server ha detto: %s"
+msgstr "USER non riuscito, il server riporta: %s"
 
 #: methods/ftp.cc:217
 #, c-format
 msgid "PASS failed, server said: %s"
-msgstr "PASS fallito, il server ha detto: %s"
+msgstr "PASS non riuscito, il server riporta: %s"
 
 #: methods/ftp.cc:237
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
-"Si � specificato un proxy server ma senza script di login, Acquire::ftp::"
-"ProxyLogin � vuoto."
+"È stato specificato un server proxy, ma nessuno script di accesso: Acquire::"
+"ftp::ProxyLogin è vuoto."
 
 #: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "Comando dello script di login '%s' fallito, il server ha detto: %s"
+msgstr ""
+"Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s"
 
 #: methods/ftp.cc:291
 #, c-format
 msgid "TYPE failed, server said: %s"
-msgstr "TYPE fallito, il server ha detto: %s"
+msgstr "TYPE non riuscito, il server riporta: %s"
 
 #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
 msgid "Connection timeout"
-msgstr "Timeout della connessione"
+msgstr "Connessione scaduta"
 
 #: methods/ftp.cc:335
 msgid "Server closed the connection"
 msgstr "Il server ha chiuso la connessione"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Errore di lettura"
 
@@ -1821,9 +1883,9 @@ msgstr "Una risposta ha superato le dimensioni del buffer."
 
 #: methods/ftp.cc:362 methods/ftp.cc:374
 msgid "Protocol corruption"
-msgstr "Corruzione nel protocollo"
+msgstr "Protocollo danneggiato"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Errore di scrittura"
 
@@ -1833,16 +1895,15 @@ msgstr "Impossibile creare un socket"
 
 #: methods/ftp.cc:698
 msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Impossibile connettersi al socket dati, tempo limite di connessione esaurito"
+msgstr "Impossibile connettersi al socket dati, connessione terminata"
 
 #: methods/ftp.cc:704
 msgid "Could not connect passive socket."
-msgstr "Impossibile connettersi in modalit� passiva"
+msgstr "Impossibile connettere socket passivo."
 
 #: methods/ftp.cc:722
 msgid "getaddrinfo was unable to get a listening socket"
-msgstr "� stato impossibile ottenere un socket in ascolto con getaddrinfo()"
+msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()"
 
 #: methods/ftp.cc:736
 msgid "Could not bind a socket"
@@ -1868,38 +1929,38 @@ msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta"
 #: methods/ftp.cc:798
 #, c-format
 msgid "EPRT failed, server said: %s"
-msgstr "EPRT fallito, il server ha detto: %s"
+msgstr "EPRT non riuscito, il server riporta: %s"
 
 #: methods/ftp.cc:818
 msgid "Data socket connect timed out"
-msgstr "Tempo limite di connessione esaurito per il socket dati"
+msgstr "Connessione al socket dati terminata"
 
 #: methods/ftp.cc:825
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
-msgstr "Problemi nella creazione dell'hash del file"
+msgstr "Si è verificato un problema nel creare l'hash del file"
 
 #: methods/ftp.cc:877
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "Impossibile ottenere un file, il server ha detto '%s'"
+msgstr "Impossibile recuperare il file, il server riporta: \"%s\""
 
 #: methods/ftp.cc:892 methods/rsh.cc:322
 msgid "Data socket timed out"
-msgstr "Tempo limite esaurito per il socket dati"
+msgstr "Socket dati terminato"
 
 #: methods/ftp.cc:922
 #, c-format
 msgid "Data transfer failed, server said '%s'"
-msgstr "Trasferimento dei dati fallito, il server ha detto '%s'"
+msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\""
 
 #. Get the files information
 #: methods/ftp.cc:997
 msgid "Query"
-msgstr "Query"
+msgstr "Interrogazione"
 
 #: methods/ftp.cc:1109
 msgid "Unable to invoke "
@@ -1908,7 +1969,7 @@ msgstr "Impossibile invocare "
 #: methods/connect.cc:70
 #, c-format
 msgid "Connecting to %s (%s)"
-msgstr "Connessione a %s (%s) in corso"
+msgstr "Connessione a %s (%s)"
 
 #: methods/connect.cc:81
 #, c-format
@@ -1928,8 +1989,7 @@ msgstr "Impossibile iniziare la connessione a %s:%s (%s)."
 #: methods/connect.cc:104
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-"Impossibile connettersi a %s:%s (%s), tempo limite di connessione esaurito"
+msgstr "Impossibile connettersi a %s:%s (%s), connessione terminata"
 
 #: methods/connect.cc:119
 #, c-format
@@ -1941,69 +2001,70 @@ msgstr "Impossibile connettersi a %s:%s (%s)."
 #: methods/connect.cc:147 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
-msgstr "Connessione a %s in corso"
+msgstr "Connessione a %s"
 
 #: methods/connect.cc:165 methods/connect.cc:184
 #, c-format
 msgid "Could not resolve '%s'"
-msgstr "Impossibile risolvere '%s'"
+msgstr "Impossibile risolvere \"%s\""
 
 #: methods/connect.cc:190
 #, c-format
 msgid "Temporary failure resolving '%s'"
-msgstr "risoluzione di '%s' temporaneamente fallita"
+msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
 
 #: methods/connect.cc:193
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "� accaduto qualcosa di anormale nella risoluzione di '%s:%s' (%i)"
+msgstr ""
+"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i)"
 
 #: methods/connect.cc:240
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Impossibile connettersi a %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
-msgstr "Impossibile accedere al keyring '%s'"
+msgstr "Impossibile accedere al portachiavi: \"%s\""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso."
+msgstr "E: Elenco argomenti da Acquire::gpgv::Options troppo lungo. Uscita."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 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?!"
+"Errore interno: firma corretta, ma non è possibile determinare l'impronta "
+"della chiave."
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
-msgstr "Almeno una firma non valida � stata trovata."
+msgstr "È stata trovata almeno una firma non valida."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
-"Impossibile esseguire '%s' per verificare la firma (gpgv � installato?)"
+"Impossibile eseguire \"%s\" per verificare la firma (forse gpgv non è "
+"installato)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Le seguenti firme non erano valide:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
-"Le seguenti firme non sono state verificate perch� la chiave pubblica non � "
+"Le seguenti firme non sono state verificate perché la chiave pubblica non è "
 "disponibile:\n"
 
 #: methods/gzip.cc:64
@@ -2016,81 +2077,80 @@ msgstr "Impossibile aprire una pipe per %s"
 msgid "Read error from %s process"
 msgstr "Errore di lettura dal processo %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "In attesa degli header"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
-msgstr "Si � ottenuto una singola linea di header su %u caratteri"
+msgstr "Ricevuta una singola riga header su %u caratteri"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
-msgstr "Linea nell'header non corretta"
+msgstr "Riga header non corretta"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Il server HTTP ha inviato un header di risposta non valido"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Il server HTTP ha inviato un Content-Length non valido"
+msgstr "Il server HTTP ha inviato un header Content-Length non valido"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Il server HTTP ha inviato un Content-Range non valido"
+msgstr "Il server HTTP ha inviato un header Content-Range non valido"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
-msgstr "Questo server HTTP ha il supporto del range bacato"
+msgstr "Questo server HTTP ha un supporto del range non corretto"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
-msgstr "Select fallito"
+msgstr "Select non riuscita"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
-msgstr "Tempo limite per la connessione esaurito"
+msgstr "Connessione terminata"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
-msgstr "Errore nella scrittura del file di output"
+msgstr "Errore nello scrivere sul file di output"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
-msgstr "Errore nella scrittura nel file"
+msgstr "Errore nello scrivere su file"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
-msgstr "Errore nella scrittura nel file"
+msgstr "Errore nello scrivere sul file"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
-msgstr ""
-"Errore nella lettura dal server. Il lato remoto ha chiuso la connessione"
+msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
-msgstr "Errore nella lettura dal server"
+msgstr "Errore nel leggere dal server"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
-msgstr "Impossibile troncare il file"
+msgstr "Troncamento del file non riuscito"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
-msgstr "Header dei dati malformato"
+msgstr "Header dati non corretto"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
-msgstr "Connessione fallita"
+msgstr "Connessione non riuscita"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Errore interno"
 
@@ -2103,11 +2163,40 @@ msgstr "Impossibile eseguire mmap su un file vuoto"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Impossibile eseguire mmap di %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "MMap dinamica ha finito lo spazio"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Mmap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
+"valore attuale è: %lu (man 5 apt.conf)."
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lig %lih %limin %lis"
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selezione %s non trovata"
@@ -2115,51 +2204,51 @@ msgstr "Selezione %s non trovata"
 #: apt-pkg/contrib/configuration.cc:439
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Tipo di abbreviazione non riconosciuto: '%c'"
+msgstr "Tipo di abbreviazione non riconosciuto: \"%c\""
 
 #: apt-pkg/contrib/configuration.cc:497
 #, c-format
 msgid "Opening configuration file %s"
-msgstr "Apertura del file di configurazione %s in corso"
+msgstr "Apertura file di configurazione %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Errore di sintassi %s:%u: Il blocco inizia senza nome"
+msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome"
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Errore di sintassi %s:%u: Tag malformato"
+msgstr "Errore di sintassi %s:%u: tag non corretto"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Errore di sintassi %s:%u: Carattere extra dopo il valore"
+msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Errore di sintassi %s:%u: Le direttive possono essere fatte solo al livello "
-"pi� alto"
+"Errore di sintassi %s:%u: le direttive possono essere fatte solo al livello "
+"più alto"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Errore di sintassi %s:%u: Troppi include annidati"
+msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "Errore di sintassi %s:%u: Incluso da qui"
+msgstr "Errore di sintassi %s:%u: incluso da qui"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Errore di sintassi %s:%u: Direttiva non supportata '%s'"
+msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file"
@@ -2167,7 +2256,7 @@ msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file"
 #: apt-pkg/contrib/progress.cc:153
 #, c-format
 msgid "%c%s... Error!"
-msgstr "%c%s... Errore!"
+msgstr "%c%s... Errore."
 
 #: apt-pkg/contrib/progress.cc:155
 #, c-format
@@ -2177,18 +2266,18 @@ msgstr "%c%s... Fatto"
 #: apt-pkg/contrib/cmndline.cc:77
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "L'opzione da linea di comando '%c' [da %s] � sconosciuta."
+msgstr "Opzione a riga di comando \"%c\" [da %s] sconosciuta."
 
 #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
 #: apt-pkg/contrib/cmndline.cc:119
 #, c-format
 msgid "Command line option %s is not understood"
-msgstr "L'opzione da linea di comando %s non � chiara"
+msgstr "Opzione a riga di comando %s non comprensibile"
 
 #: apt-pkg/contrib/cmndline.cc:124
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "L'opzione da linea di comando %s, non � booleana"
+msgstr "Opzione a riga di comando %s non booleana"
 
 #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
 #, c-format
@@ -2199,270 +2288,280 @@ msgstr "L'opzione %s richiede un argomento."
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
-"Opzione %s: la specifica di configurazione del parametro deve avere un "
+"Opzione %s: la specifica di configurazione dell'oggetto deve avere un "
 "=<valore>."
 
 #: apt-pkg/contrib/cmndline.cc:234
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
-msgstr "L'opzione %s richiede un argomento intero, non '%s'"
+msgstr "L'opzione %s richiede un argomento intero, non \"%s\""
 
 #: apt-pkg/contrib/cmndline.cc:265
 #, c-format
 msgid "Option '%s' is too long"
-msgstr "L'opzione '%s' � troppo lunga"
+msgstr "Opzione \"%s\" troppo lunga"
 
 #: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
-msgstr "Il valore %s non � chiaro, provare true o false."
+msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"."
 
 #: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
-msgstr "Operazione non valida %s"
+msgstr "Operazione %s non valida"
 
 #: apt-pkg/contrib/cdromutl.cc:52
 #, c-format
 msgid "Unable to stat the mount point %s"
-msgstr "Impossibile accedere al mount point %s"
+msgstr "Impossibile eseguire stat sul punto di mount %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
-msgstr "Impossibile raggiungere %s"
+msgstr "Impossibile passare a %s"
 
 #: apt-pkg/contrib/cdromutl.cc:188
 msgid "Failed to stat the cdrom"
-msgstr "Impossibile accedere al cdrom"
+msgstr "Esecuzione di stat sul CD-ROM non riuscita"
 
 #: apt-pkg/contrib/fileutl.cc:149
 #, c-format
 msgid "Not using locking for read only lock file %s"
-msgstr "Locking disabilitato per il file di lock in sola lettura %s"
+msgstr "Blocco disabilitato per il file di blocco in sola lettura %s"
 
 #: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Could not open lock file %s"
-msgstr "Impossibile aprire il file di lock %s"
+msgstr "Impossibile aprire il file di blocco %s"
 
 #: apt-pkg/contrib/fileutl.cc:172
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Lock disabilitato per il file di lock %s nfs montato"
+msgstr "Blocco disabilitato per il file di blocco %s montato via nfs"
 
 #: apt-pkg/contrib/fileutl.cc:176
 #, c-format
 msgid "Could not get lock %s"
-msgstr "Impossibile ottenere il lock %s"
+msgstr "Impossibile impostare il blocco %s"
 
 #: apt-pkg/contrib/fileutl.cc:444
 #, c-format
 msgid "Waited for %s but it wasn't there"
-msgstr "In attesa per %s ma non presente"
+msgstr "In attesa di %s ma non era presente"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
-msgstr "Il sottoprocesso %s ha ritornato un codice d'errore (%u)"
+msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "Il sottoprocesso %s � uscito inaspettatamente"
+msgstr "Il sottoprocesso %s è uscito inaspettatamente"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Impossibile aprire il file %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
-msgstr "letto, c'erano ancora %lu da leggere ma non e' stato lasciato nulla"
+msgstr "lettura, c'erano ancora %lu da leggere ma non ne è rimasto alcuno"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
-msgstr "scrittura, c'erano ancora %lu da scrivere ma non era possibile"
+msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
-msgstr "Si � verificato un problema chiudendo il file"
+msgstr "Si è verificato un problema nel chiudere il file"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
-msgstr "Si � verificato un problema rimuovendo il file"
+msgstr "Si è verificato un problema nell'eseguire l'unlink del file"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
-msgstr "Si � verificato un problema sincronizzando il file"
+msgstr "Si è verificato un problema nel sincronizzare il file"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Cache dei pacchetti vuota"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
-msgstr "Il file cache dei pacchetti � corrotto"
+msgstr "Il file della cache dei pacchetti è danneggiato"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
-msgstr "Il file cache dei pacchetti � in una versione incompatibile"
+msgstr "La versione del file della cache dei pacchetti è incompatibile"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr "Questo APT non supporta il sistema di versioning '%s'"
+msgstr "Questo APT non supporta il sistema di versione \"%s\""
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr ""
-"Il file cache dei pacchetti � stato generato per un'architettura differente"
+"Il file della cache dei pacchetti è stato generato per un'altra architettura"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Dipende"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
-msgstr "Predipende"
+msgstr "Pre-dipende"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Consiglia"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Raccomanda"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Va in conflitto"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Sostituisce"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Rende obsoleto"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "richiesto"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opzionale"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
-msgstr "Generazione dell'albero delle dipendenze in corso"
+msgstr "Generazione albero delle dipendenze"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Versioni candidate"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Generazione delle dipendenze"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Lettura informazioni sullo stato"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
-msgstr "Impossibile aprire il file di stato (StateFile) %s"
+msgstr "Apertura del file di stato %s non riuscita"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr "Impossibile scrivere il file temporaneo di stato (StateFile) %s"
+msgstr "Scrittura del file temporaneo di stato %s non riuscita"
 
 #: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (1)"
-msgstr "Impossibile analizzare il file dei pacchetti %s (1)"
+msgstr "Impossibile analizzare il file di pacchetto %s (1)"
 
 #: apt-pkg/tagfile.cc:189
 #, c-format
 msgid "Unable to parse package file %s (2)"
-msgstr "Impossibile analizzare il file dei pacchetti %s (2)"
+msgstr "Impossibile analizzare il file di pacchetto %s (2)"
 
 #: apt-pkg/sourcelist.cc:90
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "La linea %lu in %s (URI) non � corretta"
+msgstr "La riga %lu nel file %s non è corretta (URI)"
 
 #: apt-pkg/sourcelist.cc:92
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr "La linea %lu in %s (dist) non � corretta"
+msgstr "La riga %lu nel file %s non è corretta (dist)"
 
 #: apt-pkg/sourcelist.cc:95
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "La linea %lu in %s (URI parse) non � corretta"
+msgstr "La riga %lu nel file %s non è corretta (URI parse)"
 
 #: apt-pkg/sourcelist.cc:101
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "La linea %lu nella lista delle fonti %s (Absolute dist) non � corretta"
+msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
 
 #: apt-pkg/sourcelist.cc:108
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "La linea %lu in %s (dist parse) non � corretta"
+msgstr "La riga %lu nel file %s non è corretta (dist parse)"
 
 #: apt-pkg/sourcelist.cc:199
 #, c-format
 msgid "Opening %s"
-msgstr "Apertura di %s in corso"
+msgstr "Apertura di %s"
 
 #: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
 #, c-format
 msgid "Line %u too long in source list %s."
-msgstr "Linea %u troppo lunga nel source list %s."
+msgstr "Riga %u troppo lunga nel file %s."
 
 #: apt-pkg/sourcelist.cc:236
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "La linea %u in %s (type) non � corretta"
+msgstr "La riga %u nel file %s non è corretta (type)"
 
 #: apt-pkg/sourcelist.cc:240
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Il tipo '%s' non � riconosciuto alla linea %u nella lista sorgenti %s"
+msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
 
 #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "La linea %u in %s (vendor id) non � corretta"
+msgstr "La riga %u nel file %s non è corretta (vendor id)"
 
 #: apt-pkg/packagemanager.cc:428
 #, c-format
@@ -2471,61 +2570,63 @@ msgid ""
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
-"Quest'installazione necessita della rimozione temporanea del pacchetto "
-"essenziale %s a causa di un loop Conflitto/Pre-Dipendenza. Questo non � "
-"bene, ma se si vuole farlo, si attivi l'opzione APT::Force-LoopBreak "
+"L'installazione necessita della rimozione temporanea del pacchetto "
+"essenziale %s a causa di un ciclo conflitto/pre-dipendenza. Questa è una "
+"situazione critica, ma se si vuole realmente procedere, attivare l'opzione "
+"APT::Force-LoopBreak."
 
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
-msgstr "Il file indice di tipo '%s' non � supportato"
+msgstr "Il file indice di tipo \"%s\" non è supportato"
 
 #: apt-pkg/algorithms.cc:248
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un "
-"archivio per esso."
+"Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un "
+"archivio."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
-"Errore, pkgProblemResolver::Resolve ha generato uno stop, questo pu� essere "
-"causato da pacchetti bloccati "
+"Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo "
+"potrebbe essere causato da pacchetti bloccati."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
-msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati"
+msgstr ""
+"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
-"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure "
-"si useranno quelli precedenti."
+"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
+"usati quelli vecchi."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Manca la directory di liste %spartial."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Manca la directory di archivio %spartial."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Scaricamento file %li di %li (%s rimanente)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Scaricamento file %li di %li"
@@ -2533,179 +2634,177 @@ msgstr "Scaricamento file %li di %li"
 #: apt-pkg/acquire-worker.cc:110
 #, c-format
 msgid "The method driver %s could not be found."
-msgstr "Non � stato possibile trovare un driver per il metodo %s."
+msgstr "Impossibile trovare un driver per il metodo %s."
 
 #: apt-pkg/acquire-worker.cc:159
 #, c-format
 msgid "Method %s did not start correctly"
-msgstr "Il metodo %s non � partito correttamente"
+msgstr "Il metodo %s non si è avviato correttamente"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere "
-"invio."
+msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
-msgstr "Il sistema di archiviazione (packaging) '%s' non � supportato"
+msgstr "Il sistema di pacchetti \"%s\" non è supportato"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
 
 #: apt-pkg/clean.cc:57
 #, c-format
 msgid "Unable to stat %s."
-msgstr "Impossibile analizzare %s."
+msgstr "Impossibile eseguire stat su %s."
 
 #: apt-pkg/srcrecords.cc:44
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Bisogna inserire alcuni URI di tipo 'source' in sources.list"
+msgstr ""
+"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
 
 #: apt-pkg/cachefile.cc:71
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"La lista dei pacchetti o il file di status non possono essere letti o aperti."
+"L'elenco dei pacchetti o il file di stato non può essere letto o aperto."
 
 #: apt-pkg/cachefile.cc:75
 msgid "You may want to run apt-get update to correct these problems"
-msgstr "� consigliabile eseguire apt-get update per correggere questi problemi"
+msgstr ""
+"È consigliato eseguire \"apt-get update\" per correggere questi problemi"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
-msgstr "Campo non valido nel file delle preferenze, Manca \"Package header\""
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Campo non valido nel file delle preferenze: manca l'header \"Package\""
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr "Impossibile capire il tipo di pin %s"
+msgstr "Impossibile capire il tipo di gancio %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
-msgstr "Nessuna (o zero) priorit� specificata per il pin"
+msgstr "Priorità per il gancio non specificata (o zero)"
 
 #: apt-pkg/pkgcachegen.cc:72
 msgid "Cache has an incompatible versioning system"
-msgstr "La cache ha un sistema incompatibile di gestione delle versioni"
+msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
 
 #: apt-pkg/pkgcachegen.cc:115
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Errore nell'analisi di %s (NewPackage)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewPackage)"
 
 #: apt-pkg/pkgcachegen.cc:130
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Errore nell'analisi di %s (UsePackage1)"
+msgstr "Si è verificato un errore nell'elaborare %s (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:164
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Errore nell'analisi di %s (NewFileDesc1)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc1)"
 
 #: apt-pkg/pkgcachegen.cc:189
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Errore nell'analisi di %s (UsePackage2)"
+msgstr "Si è verificato un errore nell'elaborare %s (UsePackage2)"
 
 #: apt-pkg/pkgcachegen.cc:193
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Errore nell'analisi di %s (NewFileVer1)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:224
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Errore nell'analisi di %s (NewVersion1)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:228
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Errore nell'analisi di %s (UsePackage3)"
+msgstr "Si è verificato un errore nell'elaborare %s (UsePackage3)"
 
 #: apt-pkg/pkgcachegen.cc:232
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Errore nell'analisi di %s (NewVersion2)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:256
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Errore nell'analisi di %s (NewFileDesc2)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc2)"
 
 #: apt-pkg/pkgcachegen.cc:262
 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"
+"È stato superato il numero di nomi di pacchetti che questo APT può gestire."
 
 #: apt-pkg/pkgcachegen.cc:265
 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"
+msgstr "È stato superato il numero di versioni che questo APT può gestire."
 
 #: apt-pkg/pkgcachegen.cc:268
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"WOW, si � superato il numero massimo di descrizioni che questo APT � capace "
-"di gestire"
+msgstr "È stato superato il numero di descrizioni che questo APT può gestire."
 
 #: apt-pkg/pkgcachegen.cc:271
 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"
+msgstr "È stato superato il numero di dipendenze che questo APT può gestire."
 
 #: apt-pkg/pkgcachegen.cc:299
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Errore nell'analisi di %s (FindPkg)"
+msgstr "Si è verificato un errore nell'elaborare %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:312
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Errore nell'analisi di %s (CollectFileProvides)"
+msgstr "Si è verificato un errore nell'elaborare %s (CollectFileProvides)"
 
+# (ndt) il primo è il nome del pacchetto, il secondo la versione
 #: apt-pkg/pkgcachegen.cc:318
 #, 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"
+"Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle "
+"dipendenze"
 
 #: apt-pkg/pkgcachegen.cc:690
 #, c-format
 msgid "Couldn't stat source package list %s"
-msgstr "Impossibile controllare la lista dei pacchetti sorgente %s"
+msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
 
+# (ndt) non mi convince per niente, ma vediamo cosa salta fuori
 #: apt-pkg/pkgcachegen.cc:775
 msgid "Collecting File Provides"
-msgstr "Il File Collezionato Fornisce"
+msgstr "Il file fornisce"
 
 #: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
 msgid "IO Error saving source cache"
-msgstr "Errore di I/O nel salvataggio del cache sorgente"
+msgstr "Errore di I/O nel salvare la cache sorgente"
 
 #: apt-pkg/acquire-item.cc:127
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
-msgstr "rename() fallita: %s (%s -> %s)."
+msgstr "rename() non riuscita: %s (%s -> %s)."
 
 #: apt-pkg/acquire-item.cc:401
 msgid "MD5Sum mismatch"
-msgstr "Somma MD5 non corrispondente"
+msgstr "MD5sum non corrispondente"
 
 #: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
 msgid "Hash Sum mismatch"
-msgstr "Somma Hash non corrispondente"
+msgstr "Somma hash non corrispondente"
 
 #: apt-pkg/acquire-item.cc:1118
 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"
+"Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
 
 #: apt-pkg/acquire-item.cc:1231
 #, c-format
@@ -2713,9 +2812,8 @@ msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
-"Non � stato possibile trovare un file per il pacchetto %s. Questo significa "
-"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
-"mancante)"
+"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
+"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
 
 #: apt-pkg/acquire-item.cc:1290
 #, c-format
@@ -2723,25 +2821,42 @@ msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
-"Non � stato possibile trovare file per il pacchetto %s. Questo significa che "
-"bisogna correggere manualmente l'errore."
+"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
+"sistemare manualmente questo pacchetto."
 
 #: apt-pkg/acquire-item.cc:1331
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"I file indice dei pacchetti sono corrotti. Non c'� un campo Filename: per il "
+"L'indice dei file è danneggiato. Manca il campo \"Filename:\" per il "
 "pacchetto %s."
 
 #: apt-pkg/acquire-item.cc:1418
 msgid "Size mismatch"
-msgstr "Le Dimensioni non corrispondono"
+msgstr "Le dimensioni non corrispondono"
+
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Impossibile analizzare il file di pacchetto %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Nota, viene selezionato %s al posto di %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
-msgstr "Il blocco vendor %s non contiene dati"
+msgstr "Il blocco vendor %s non contiene impronte"
 
 #: apt-pkg/cdrom.cc:529
 #, c-format
@@ -2749,30 +2864,30 @@ msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
-"Si user� il punto di montaggio del CD-ROM %s\n"
+"Viene usato il punto di mount del CD-ROM %s\n"
 "Montaggio CD-ROM\n"
 
 #: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
 msgid "Identifying.. "
-msgstr "Identificazione in corso.. "
+msgstr "Identificazione... "
 
 #: apt-pkg/cdrom.cc:563
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Etichette salvate: %s \n"
+msgstr "Etichette archiviate: %s \n"
 
 #: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
 msgid "Unmounting CD-ROM...\n"
-msgstr "Smontaggio CD-ROM in corso...\n"
+msgstr "Smontaggio CD-ROM...\n"
 
 #: apt-pkg/cdrom.cc:590
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
-msgstr "Si user� il mount point del CD-ROM %s\n"
+msgstr "Viene usato il punto di mount del CD-ROM %s\n"
 
 #: apt-pkg/cdrom.cc:608
 msgid "Unmounting CD-ROM\n"
-msgstr "Smontaggio CD-ROM in corso\n"
+msgstr "Smontaggio CD-ROM\n"
 
 #: apt-pkg/cdrom.cc:612
 msgid "Waiting for disc...\n"
@@ -2781,11 +2896,11 @@ msgstr "In attesa del disco...\n"
 #. Mount the new CDROM
 #: apt-pkg/cdrom.cc:620
 msgid "Mounting CD-ROM...\n"
-msgstr "Montaggio CD-ROM in corso   \n"
+msgstr "Montaggio CD-ROM...\n"
 
 #: apt-pkg/cdrom.cc:638
 msgid "Scanning disc for index files..\n"
-msgstr "Scansione del disco alla ricerca di file indice, in corso..\n"
+msgstr "Analisi del disco per file indice...\n"
 
 #: apt-pkg/cdrom.cc:678
 #, c-format
@@ -2796,14 +2911,20 @@ msgstr ""
 "Trovati %zu indici di pacchetto, %zu indici di sorgente, %zu indici di "
 "traduzione e %zu firme\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
-msgstr "Etichetta trovata \"%s\"\n"
+msgstr "Trovata l'etichetta \"%s\"\n"
 
 #: apt-pkg/cdrom.cc:744
 msgid "That is not a valid name, try again.\n"
-msgstr "Questo non � un nome valido, riprovare.\n"
+msgstr "Questo non è un nome valido, riprovare.\n"
 
 #: apt-pkg/cdrom.cc:760
 #, c-format
@@ -2811,175 +2932,150 @@ msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
-"Questo disco � chiamato: \n"
-"'%s'\n"
+"Questo disco è chiamato: \n"
+"\"%s\"\n"
 
 #: apt-pkg/cdrom.cc:764
 msgid "Copying package lists..."
-msgstr "Copia della lista dei pacchetti in corso..."
+msgstr "Copia elenco pacchetti..."
 
 #: apt-pkg/cdrom.cc:790
 msgid "Writing new source list\n"
-msgstr "Scrittura di una nuova lista sorgenti in corso\n"
+msgstr "Scrittura nuovo elenco sorgenti\n"
 
 #: apt-pkg/cdrom.cc:799
 msgid "Source list entries for this disc are:\n"
-msgstr "Le voci lista sorgenti per questo Disco sono:\n"
+msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Scritti %i record.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Scritti %i record con %i file mancanti.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Scritti %i record con %i file senza match\n"
+msgstr "Scritti %i record con %i file senza corrispondenze\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, 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"
+msgstr ""
+"Scritti %i record con %i file mancanti e %i file senza corrispondenze\n"
 
 #: apt-pkg/deb/dpkgpm.cc:49
 #, c-format
 msgid "Installing %s"
-msgstr "Installazione di %s in corso"
+msgstr "Installazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
-msgstr "Configurazione di %s in corso"
+msgstr "Configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
-msgstr "Rimozione di %s in corso"
+msgstr "Rimozione di %s"
 
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Running post-installation trigger %s"
-msgstr "Esecuzione del comando post installazione %s"
+msgstr "Esecuzione comando di post installazione %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
-msgstr "Manca la directory '%s'"
+msgstr "Directory \"%s\" mancante"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
-msgstr "Preparazione di %s in corso"
+msgstr "Preparazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
-msgstr "Scompattamento di %s in corso"
+msgstr "Estrazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
-msgstr "Preparazione alla configurazione di %s in corso"
-
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Elaborazione opzioni addizionali per %s"
+msgstr "Preparazione alla configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
-msgstr "%s Installato"
+msgstr "Pacchetto %s installato"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr "Preparazione per la rimozione di %s in corso"
+msgstr "Preparazione alla rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
-msgstr "%s rimosso"
+msgstr "Pacchetto %s rimosso"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
-msgstr "Preparazione alla rimozione totale di %s in corso"
+msgstr "Preparazione alla rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
-msgstr "Rimozione totale completata %s"
+msgstr "Pacchetto %s rimosso completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr "Impossibile scrivere un log, openpty() fallito (/dev/pts � montato?)\n"
-
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Impossibile aprire il file %s"
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Connessione chiusa prematuramente"
-
-#~ msgid ""
-#~ "Since you only requested a single operation it is extremely likely that\n"
-#~ "the package is simply not installable and a bug report against\n"
-#~ "that package should be filed."
-#~ msgstr ""
-#~ "Poiché Ú stata richiesta solo una singola operazione Ú molto facile "
-#~ "che\n"
-#~ "il pacchetto semplicemente non sia installabile, si consiglia\n"
-#~ "di inviare un \"bug report\" per tale pacchetto."
-
-#, fuzzy
-#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "Linea %d troppo lunga (max %d)"
-
-#, fuzzy
-#~ msgid "Line %d too long (max %d)"
-#~ msgstr "Linea %d troppo lunga (max %d)"
-
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc1)"
-#~ msgstr "Errore nell'analisi di %s (NewFileVer1)"
+msgstr ""
+"Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
+"è montato)\n"
 
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc2)"
-#~ msgstr "Errore nell'analisi di %s (NewFileVer1)"
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Stored label: %s \n"
-#~ msgstr "Etichette salvate: %s \n"
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
 
-#, fuzzy
-#~ 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/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Impossibile bloccare la directory"
 
-#, fuzzy
-#~ msgid "openpty failed\n"
-#~ msgstr "Select fallito"
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
 
-#~ msgid "File date has changed %s"
-#~ msgstr "La data del file Ú cambiata %s"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr "Non bloccato"
 
-#~ msgid "Reading file list"
-#~ msgstr "Lettura della lista dei file in corso"
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Impossibile applicare la patch al file"
 
-#~ msgid "Could not execute "
-#~ msgstr "Impossibile eseguire "
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Connessione chiusa prematuramente"
 
-#~ msgid "Preparing for remove with config %s"
-#~ msgstr "Preparazione per la rimozione con la configurazione %s in corso"
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
 
-#~ msgid "Removed with config %s"
-#~ msgstr "Rimosso con la configurazione %s"
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Elaborazione opzioni addizionali per %s"
diff --git a/po/ja.po b/po/ja.po
index c4ac2dd0e..1f2b0df9c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-11-13 09:26+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -16,153 +16,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8 bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "パッケージ %s が見つかりません"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "パッケージ名総数: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  通常パッケージ: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  純粋仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  単一仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  複合仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  欠落: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "個別バージョン総数: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "個別説明総数: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "依存関係総数: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "バージョン/ファイル関係総数: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "説明/ファイル関係総数: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "提供マッピング総数: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Glob 文字列の総数: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "総依存関係・バージョン容量: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "総空き容量: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "総占有容量: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Package ファイル %s が同期していません。"
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "パターンはちょうど 1 つだけ指定してください"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "パッケージが見つかりません"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "パッケージファイル:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Pin パッケージ:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(見つかりません)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  インストールされているバージョン: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(なし)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  候補: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  パッケージ Pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  バージョンテーブル:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s コンパイル日時: %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -651,79 +646,79 @@ msgstr "%s のリンク解除で問題が発生しました"
 msgid "Failed to rename %s to %s"
 msgstr "%s を %s に名前変更できませんでした"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "正規表現の展開エラー - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "以下のパッケージには満たせない依存関係があります:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "しかし、%s はインストールされています"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "しかし、%s はインストールされようとしています"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "しかし、インストールすることができません"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "しかし、これは仮想パッケージです"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "しかし、インストールされていません"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "しかし、インストールされようとしていません"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " または"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "以下のパッケージが新たにインストールされます:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "以下のパッケージは「削除」されます:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "以下のパッケージは保留されます:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "以下のパッケージはアップグレードされます:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "以下のパッケージは「ダウングレード」されます:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "以下の変更禁止パッケージは変更されます:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s のため) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -731,146 +726,146 @@ msgstr ""
 "警告: 以下の不可欠パッケージが削除されます。\n"
 "何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "再インストール: %lu 個、"
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ダウングレード: %lu 個、"
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "削除: %lu 個、保留: %lu 個。\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "依存関係を解決しています ..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " 失敗しました。"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "依存関係を訂正できません"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "アップグレードセットを最小化できません"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " 完了"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
 "ん。"
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "未解決の依存関係があります。-f オプションを試してください。"
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "警告: 以下のパッケージは認証されていません!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "認証の警告は上書きされました。\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "いくつかのパッケージを認証できませんでした"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部エラー、調整が終わっていません"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "ダウンロードディレクトリをロックできません"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "ソースのリストを読むことができません。"
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%sB のアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "この操作後に追加で %sB のディスク容量が消費されます。\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "この操作後に %sB のディスク容量が解放されます。\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s の空き領域を測定できません"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s に充分な空きスペースがありません。"
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。"
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -881,28 +876,28 @@ msgstr ""
 "続行するには、'%s' というフレーズをタイプしてください。\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "中断しました。"
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "続行しますか [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s の取得に失敗しました  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "いくつかのファイルの取得に失敗しました"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -910,49 +905,49 @@ msgstr ""
 "いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-"
 "missing オプションを付けて試してみてください。"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "足りないパッケージを直すことができません。"
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "インストールを中断します。"
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "注意、%2$s の代わりに %1$s を選択します\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "すでにインストールされておりアップグレードも設定されていないため、%s をスキッ"
 "プします。\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "パッケージ %s はインストールされていないため、削除はできません\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [インストール済み]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "インストールするパッケージを明示的に選択する必要があります。"
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -963,65 +958,70 @@ msgstr ""
 "おそらく、そのパッケージが見つからないか、もう古くなっているか、\n"
 "あるいは別のソースからのみしか利用できないという状況が考えられます\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "しかし、以下のパッケージで置き換えられています:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "パッケージ %s にはインストール候補がありません"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s はすでに最新バージョンです。\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "update コマンドは引数をとりません"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "list ディレクトリをロックできません"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "一連のものを削除するようになっていないので、AutoRemover を開始できません"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "これらを削除するには 'apt-get autoremove' を利用してください。"
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1039,45 +1039,45 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部エラー、AutoRemover が何かを破壊しました"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部エラー、AllUpgrade が何かを破壊しました"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "タスク %s が見つかりません"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "パッケージ %s が見つかりません"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s は手動でインストールしたと設定されました。\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
 "ません:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1085,7 +1085,7 @@ msgstr ""
 "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
 "を明示してください)。"
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1097,118 +1097,118 @@ msgstr ""
 "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
 "動されていないことが考えられます。"
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "壊れたパッケージ"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "以下の特別パッケージがインストールされます:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "提案パッケージ:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "推奨パッケージ:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "アップグレードパッケージを検出しています ... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "完了"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部エラー、問題リゾルバが何かを破壊しました"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s のソースパッケージが見つかりません"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s に充分な空きスペースがありません"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ソース %s を取得\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "いくつかのアーカイブの取得に失敗しました。"
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "展開コマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 "'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ビルドコマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "子プロセスが失敗しました"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s のビルド依存情報を取得できません"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s にはビルド依存情報が指定されていません。\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1217,7 @@ msgstr ""
 "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
 "ができません"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1226,33 @@ msgstr ""
 "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
 "する %1$s の依存関係を満たすことができません"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s のビルド依存関係を満たすことができませんでした。"
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "ビルド依存関係の処理に失敗しました"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "サポートされているモジュール:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1267,7 +1268,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1339,6 +1340,14 @@ msgstr ""
 "apt.conf(5) を参照してください。\n"
 "                        この APT は Super Cow Powers 化されています。\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "ヒット "
@@ -1568,9 +1577,9 @@ msgstr "%s に対するバージョンのないパッケージマッチを上書
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s を読み込むことができません"
@@ -1804,7 +1813,7 @@ msgstr "接続タイムアウト"
 msgid "Server closed the connection"
 msgstr "サーバが接続を切断しました"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "読み込みエラー"
 
@@ -1816,7 +1825,7 @@ msgstr "レスポンスがバッファをオーバフローさせました。"
 msgid "Protocol corruption"
 msgstr "プロトコルが壊れています"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "書き込みエラー"
 
@@ -1870,7 +1879,7 @@ msgstr "データソケット接続タイムアウト"
 msgid "Unable to accept connection"
 msgstr "接続を accept できません"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "ファイルのハッシュでの問題"
 
@@ -1954,41 +1963,41 @@ msgstr "'%s:%s' (%i) の解決中に問題が起こりました"
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s へ接続できません:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "キーリングにアクセスできませんでした: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "エラー: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。"
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "少なくとも 1 つの不正な署名が発見されました。"
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "署名を検証するための '%s' の実行ができませんでした (gpgv はインストールされて"
 "いますか?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "gpgv の実行中に未知のエラーが発生"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "以下の署名が無効です:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2004,80 +2013,80 @@ msgstr "%s に対してパイプを開けませんでした"
 msgid "Read error from %s process"
 msgstr "%s プロセスからの読み込みエラー"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "ヘッダの待機中です"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u 文字を超える 1 行のヘッダを取得しました"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "不正なヘッダ行です"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http サーバが不正なリプライヘッダを送信してきました"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "http サーバのレンジサポートが壊れています"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "不明な日付フォーマットです"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "select に失敗しました"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "接続タイムアウト"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "出力ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗しました"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "ファイルの切り詰めに失敗しました"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "不正なヘッダです"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "内部エラー"
 
@@ -2090,11 +2099,38 @@ msgstr "空のファイルを mmap できません"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "%lu バイトの mmap ができませんでした"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "動的 MMap が制限を越えました"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "選択された %s が見つかりません"
@@ -2109,42 +2145,42 @@ msgstr "理解できない省略形式です: '%c'"
 msgid "Opening configuration file %s"
 msgstr "設定ファイル %s をオープンできませんでした"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。"
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "文法エラー %s:%u: 不正なタグです"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "文法エラー %s:%u: インクルードのネストが多すぎます"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "文法エラー %s:%u: ここからインクルードされています"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "文法エラー %s:%u: 未対応の命令 '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
@@ -2211,7 +2247,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "マウントポイント %s の状態を取得できません"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s へ変更することができません"
@@ -2245,143 +2281,153 @@ msgstr "ロック %s が取得できませんでした"
 msgid "Waited for %s but it wasn't there"
 msgstr "%s を待ちましたが、そこにはありませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子プロセス %s がエラーコード (%u) を返しました"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子プロセス %s が予期せず終了しました"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "ファイル %s をオープンできませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "読み込みが %lu 残っているはずですが、何も残っていません"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "ファイルのクローズ中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "ファイルの削除中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "ファイルの同期中に問題が発生しました"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "空のパッケージキャッシュ"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "パッケージキャッシュファイルが壊れています"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "このパッケージキャッシュファイルは互換性がないバージョンです"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "この APT はバージョニングシステム '%s' をサポートしていません"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "依存"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "先行依存"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "提案"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "推奨"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "競合"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "置換"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "廃止"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "破壊"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "要求"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "任意"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "特別"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "依存関係ツリーを作成しています"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "候補バージョン"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "依存関係の生成"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "状態情報を読み取っています"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "状態ファイル %s のオープンに失敗しました"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "一時状態ファイル %s の書き込みに失敗しました"
@@ -2470,7 +2516,7 @@ msgstr ""
 "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
 "つけることができませんでした。"
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2478,11 +2524,11 @@ msgstr ""
 "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
 "ジが原因です。"
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2490,24 +2536,24 @@ msgstr ""
 "いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
 "るか、古いものが代わりに使われます。"
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "リストディレクトリ %spartial が見つかりません。"
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "アーカイブディレクトリ %spartial が見つかりません。"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "ファイルを取得しています %li/%li (残り %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "ファイルを取得しています %li/%li"
@@ -2522,19 +2568,19 @@ msgstr "メソッドドライバ %s が見つかりません。"
 msgid "Method %s did not start correctly"
 msgstr "メソッド %s が正常に開始しませんでした"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ"
 "い。"
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "パッケージングシステム '%s' はサポートされていません"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "適切なパッケージシステムタイプを特定できません"
 
@@ -2559,18 +2605,20 @@ msgstr ""
 "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
 "せん"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ"
 "ん"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "pin タイプ %s が理解できませんでした"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "pin で優先度 (または 0) が指定されていません"
 
@@ -2714,6 +2762,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "サイズが適合しません"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "パッケージファイル %s を解釈することができません (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "注意、%2$s の代わりに %1$s を選択します\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2772,6 +2837,12 @@ msgstr ""
 "%zu のパッケージインデックス、%zu のソースインデックス、%zu の翻訳インデック"
 "ス、%zu の署名を見つけました\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2802,22 +2873,22 @@ msgstr "新しいソースリストを書き込んでいます\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "このディスクのソースリストのエントリ:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i レコードを書き込みました。\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2829,12 +2900,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "%s をインストールしています"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "%s を設定しています"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "%s を削除しています"
@@ -2844,63 +2915,84 @@ msgstr "%s を削除しています"
 msgid "Running post-installation trigger %s"
 msgstr "インストール後トリガ %s を実行しています"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ディレクトリ '%s' が見つかりません"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "%s を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s を展開しています"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s の設定を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "%s のトリガーを処理しています"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s をインストールしました"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s の削除を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s を削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s を完全に削除する準備をしています"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s を完全に削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな"
 "い?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "list ディレクトリをロックできません"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "ファイルにパッチできませんでした"
@@ -2908,3 +3000,12 @@ msgstr "ファイルにパッチできませんでした"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "途中で接続がクローズされました"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "%s のトリガーを処理しています"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "動的 MMap が制限を越えました"
diff --git a/po/km.po b/po/km.po
index 0712d2bfe..9ecea2f87 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_km\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -19,192 +19,151 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  កញ្ចប់​ធម្មតា ៖ "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​សុទ្ធ ៖ "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​តែ​មួយ ៖ "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​លាយ ៖ "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  បាត់បង់ ៖ "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "ភាព​អាស្រ័យ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "ការផ្គូរផ្គង​ការផ្ដល់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "ខ្សែ​អក្សរ​សរុប​ ៖ "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "ទំហំ​កំណែ​ភាព​អាស្រ័យ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "ទំហំ slack សរុប ៖"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។"
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "រក​កញ្ចប់​មិន​ឃើញ"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "ឯកសារ​កញ្ចប់ ៖"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ឃ្លាំង​សម្ងាត់​ឋិតនៅ​ក្រៅ​ការ​ធ្វើ​សមកាល​កម្ម ដែលមិន​អាច x-ref ឯកសារ​កញ្ចប់​បាន​ទេ"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(រក​មិន​ឃើញ)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  បាន​ដំឡើង ៖ "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(គ្មាន)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  សាកល្បង ៖ "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  ខ្ទាស់​កញ្ចប់ ៖ "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  តារាង​កំណែ ៖"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -691,79 +650,79 @@ msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់
 msgid "Failed to rename %s to %s"
 msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex កំហុស​ការចងក្រង​ - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " ឬ"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (ដោយ​សារតែ​ %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -771,143 +730,143 @@ msgstr ""
 "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n"
 "ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu ​ត្រូវបានបន្ទាប់ "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " បាន​បរាជ័យ ។"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " ធ្វើ​រួច"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ `apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។"
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "ត្រូវការ​​យក​ %sB/%sB នៃ​ប័ណ្ណសារ ។​\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ត្រូវ​ការយក​ %sB នៃ​ប័ណ្ណសារ ។\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​ការ​បន្ថែម​​ទំហំ​ថាស​ត្រូវ​បាន​ប្រើ ។\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។"
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -918,28 +877,28 @@ msgstr ""
 "ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "បោះបង់ ។"
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -947,47 +906,47 @@ msgstr ""
 "អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --"
 "fix- ដែលបាត់ឬ់ ?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។"
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "កញ្ចប់​ %s ជា​កញ្ចប់​និម្មិត​ដែល​បាន​ផ្តល់​ដោយ​ ៖\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [បានដំឡើង​]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "អ្នក​គួរតែ​ជ្រើស​យក​មួយ​​ឲ្យ​ច្បាស់​ដើម្បី​ដំឡើង​ ។"
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -998,64 +957,69 @@ msgstr ""
 "វា​មានន័យ​ថា​បាត់កញ្ចប់ ​គេ​លែង​ប្រើ ឬ\n"
 "អាច​រក​បាន​ពី​ប្រភព​ផ្សេង​ទៀត\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "ទោះ​យ៉ាងណា​ក៏ដោយ កញ្ចប់​ខាងក្រោម​ជំនួស​វា ៖"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "កញ្ចប់​ %s មិនមាន​ការដំឡើងសាកល្បងឡើយ"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1071,51 +1035,51 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1127,122 +1091,122 @@ msgstr ""
 "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
 " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "បាន​បរាជ័យ"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "ធ្វើរួច​"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1251,30 +1215,30 @@ msgstr ""
 "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
 "តម្រូវការ​កំណែបានឡើយ"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1291,7 +1255,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1357,6 +1321,14 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "វាយ​"
@@ -1585,9 +1557,9 @@ msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "មិន​អាច​អាន​ %s បានឡើយ"
@@ -1817,7 +1789,7 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​"
 msgid "Server closed the connection"
 msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "ការអាន​មានកំហុស"
 
@@ -1829,7 +1801,7 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន
 msgid "Protocol corruption"
 msgstr "ការបង្ខូច​ពិធីការ​"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "ការសរសេរ​មានកំហុស"
 
@@ -1883,7 +1855,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័
 msgid "Unable to accept connection"
 msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
 
@@ -1967,38 +1939,38 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក
 msgid "Unable to connect to %s %s:"
 msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "មិន​អាច​ចូល​ដំណើរការ keyring ៖ '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ ចេញ​ ។"
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2014,81 +1986,81 @@ msgstr "មិន​អាច​បើក​បំពុង​សម្រាប
 msgid "Read error from %s process"
 msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "កំពុង​រង់ចាំ​បឋមកថា"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "យកបន្ទាត់​បឋមកថា​តែមួយ​​ ដែលលើស %u តួអក្សរ"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "ជួរ​បឋមកថា​ខូច​"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកថាចម្លើយតបមិនត្រឹមត្រូវ"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "ជ្រើស​បាន​បរាជ័យ​"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 
@@ -2101,11 +2073,38 @@ msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
@@ -2120,42 +2119,42 @@ msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រ
 msgid "Opening configuration file %s"
 msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្តើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។"
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ​"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ​"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ"
@@ -2222,7 +2221,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s បានឡើយ"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ"
@@ -2256,144 +2255,154 @@ msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ"
 msgid "Waited for %s but it wasn't there"
 msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ ការធ្វើកំណែនេះទេ​ '%s'"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "អាស្រ័យ​"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "អាស្រ័យជា​មុន"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "ផ្ដល់យោបល់​"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "ផ្តល់​អនុសាសន៍​"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "ប៉ះទង្គិច"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "ជំនួស​"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "លែង​ប្រើ"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "សំខាន់​"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "បាន​ទាមទារ"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "គំរូ"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "ស្រេចចិត្ត"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "បន្ថែម"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "កំណែ​សាកល្បង​"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 #, fuzzy
 msgid "Reading state information"
 msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
@@ -2480,7 +2489,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។"
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2488,35 +2497,35 @@ msgstr ""
 "កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​"
 "ដែលបាន​ទុក ។"
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 "ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li"
@@ -2531,17 +2540,17 @@ msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ
 msgid "Method %s did not start correctly"
 msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
 
@@ -2562,16 +2571,18 @@ msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថ�
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ"
 
@@ -2714,6 +2725,23 @@ msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្
 msgid "Size mismatch"
 msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2771,6 +2799,12 @@ msgid ""
 "zu signatures\n"
 msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i  លិបិក្រម​ប្រភព%i  និង ហត្ថលេខា %i \n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
@@ -2801,22 +2835,22 @@ msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ
 msgid "Source list entries for this disc are:\n"
 msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា ។\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
@@ -2826,12 +2860,12 @@ msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួ�
 msgid "Installing %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "កំពុង​យក %s ចេញ"
@@ -2841,61 +2875,82 @@ msgstr "កំពុង​យក %s ចេញ"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "កំពុងរៀបចំ​ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "កំពុង​ស្រាយ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "​កំហុស​ដំណើរការ​ថត​ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "បាន​យក %s ចេញ"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
@@ -2905,6 +2960,13 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ�
 msgid "Connection closed prematurely"
 msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "​កំហុស​ដំណើរការ​ថត​ %s"
+
 #~ 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"
diff --git a/po/ko.po b/po/ko.po
index 1d2a35c96..e951c32f4 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-11-13 07:14+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -13,153 +13,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "%s 패키지의 %s 버전의 의존성이 맞지 않습니다:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "전체 패키지 이름 : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  일반 패키지: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  순수 가상 패키지: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  단일 가상 패키지: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  혼합 가상 패키지: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  빠짐: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "개별 버전 전체: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "개별 설명 전체: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "전체 의존성: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "전체 버전/파일 관계: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "전체 설명/파일 관계: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "전체 제공 매핑: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "전체 패턴 문자열: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "전체 의존성 버전 용량: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "전체 빈 용량: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "차지하는 전체 용량: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "정확히 한 개의 패턴을 넘겨야 합니다"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "패키지가 없습니다"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "패키지 파일:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "캐시가 동기화되지 않았습니다. 패키지 파일을 상호 참조할 수 없습니다"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "핀 패키지:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(없음)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  설치: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(없음)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  후보: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  패키지 핀: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  버전 테이블:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s(%s), 컴파일 시각 %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -648,79 +643,79 @@ msgstr "%s의 링크를 해제하는 데 문제가 있습니다"
 msgid "Failed to rename %s to %s"
 msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "정규식 컴파일 오류 - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "다음 패키지의 의존성이 맞지 않습니다:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "하지만 %s 패키지를 설치했습니다"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "하지만 %s 패키지를 설치할 것입니다"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "하지만 설치할 수 없습니다"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "하지만 가상 패키지입니다"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "하지만 설치하지 않았습니다"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " 혹은"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "다음 새 패키지를 설치할 것입니다:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "다음 패키지를 지울 것입니다:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "다음 패키지를 과거 버전으로 유지합니다:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "다음 패키지를 업그레이드할 것입니다:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "다음 패키지를 다운그레이드할 것입니다:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s때문에) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -728,149 +723,149 @@ msgstr ""
 "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n"
 "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu개 업그레이드, %lu개 새로 설치, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu개 다시 설치, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu개 업그레이드, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "의존성을 바로잡는 중입니다..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " 실패."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "의존성을 바로잡을 수 없습니다"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "업그레이드 집합을 최소화할 수 없습니다"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " 완료"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 "이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "경고: 다음 패키지를 인증할 수 없습니다!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "인증 경고를 무시합니다.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "확인하지 않고 패키지를 설치하시겠습니까 [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "인증할 수 없는 패키지가 있습니다"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "패키지를 지워야 하지만 지우기가 금지되어 있습니다."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "다운로드 디렉토리를 잠글 수 없습니다"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "소스 목록을 읽을 수 없습니다."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십"
 "시오."
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%s바이트 아카이브를 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s 안에 충분한 여유 공간이 없습니다."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
 "아닙니다."
 
 # 입력을 받아야 한다.  한글 입력을 못 할 수 있으므로 원문 그대로 사용.
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -881,28 +876,28 @@ msgstr ""
 "계속하시려면 다음 문구를 입력하십시오: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "중단."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "계속 하시겠습니까 [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s 파일을 받는 데 실패했습니다  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "일부 파일을 받는 데 실패했습니다"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -910,48 +905,48 @@ msgstr ""
 "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
 "missing 옵션을 줘서 실행해야 할 것입니다."
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "빠진 패키지를 바로잡을 수 없습니다."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "설치를 중단합니다."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "주의, %2$s 대신에 %1$s 패키지를 선택합니다\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s 패키지는 다음 패키지가 제공하는 가상 패키지입니다:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [설치함]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "설치할 패키지를 하나 분명히 지정해야 합니다."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -962,63 +957,68 @@ msgstr ""
 "해당 패키지가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n"
 "패키지를 받아와야 하는 경우일 수도 있습니다.\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "하지만 다음 패키지가 대체합니다:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "%s 패키지는 설치할 수 있는 후보가 없습니다"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "update 명령은 인수를 받지 않습니다"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "목록 디렉토리를 잠글 수 없습니다"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1036,44 +1036,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "%s 작업를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 패키지 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1081,7 +1081,7 @@ msgstr ""
 "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
 "(아니면 해결 방법을 지정하십시오)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1092,115 +1092,115 @@ msgstr ""
 "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
 "아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "망가진 패키지"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "다음 패키지를 더 설치할 것입니다:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "제안하는 패키지:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "추천하는 패키지:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "업그레이드를 계산하는 중입니다... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "실패"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "완료"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s의 소스 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s에 충분한 공간이 없습니다"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s 소스를 가져옵니다\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "일부 아카이브를 가져오는 데 실패했습니다."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "압축 풀기 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "빌드 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "하위 프로세스가 실패했습니다"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1209,7 +1209,7 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1218,32 +1218,33 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
 "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "빌드 의존성을 처리하는 데 실패했습니다"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1259,7 +1260,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1326,6 +1327,14 @@ msgstr ""
 "apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
 "                       이 APT는 Super Cow Powers로 무장했습니다.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "기존 "
@@ -1556,9 +1565,9 @@ msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 �
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s을(를) 읽을 수 없습니다"
@@ -1789,7 +1798,7 @@ msgstr "연결 시간 초과"
 msgid "Server closed the connection"
 msgstr "서버에서 연결을 닫았습니다"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "읽기 오류"
 
@@ -1801,7 +1810,7 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다."
 msgid "Protocol corruption"
 msgstr "프로토콜이 틀렸습니다"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "쓰기 오류"
 
@@ -1855,7 +1864,7 @@ msgstr "데이터 소켓 연결 시간 초과"
 msgid "Unable to accept connection"
 msgstr "연결을 받을 수 없습니다"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "파일 해싱에 문제가 있습니다"
 
@@ -1939,40 +1948,40 @@ msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생�
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s에 연결할 수 없습니다:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "키링에 접근할 수 없습니다: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "서명을 확인하는 '%s' 프로그램을 실행할 수 없습니다. (gnuv 프로그램을 설치했습"
 "니까?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "다음 서명이 올바르지 않습니다:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1988,80 +1997,80 @@ msgstr "%s에 대한 파이프를 열 수 없습니다"
 msgid "Read error from %s process"
 msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "헤더를 기다리는 중입니다"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "헤더 줄이 잘못되었습니다"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "데이터 형식을 알 수 없습니다"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "select가 실패했습니다"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "연결 시간이 초과했습니다"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "파일에 쓰는 데 오류가 발생했습니다"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "서버에서 읽는 데 오류가 발생했습니다"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "파일을 자르는 데 실패했습니다"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "헤더 데이터가 잘못되었습니다"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "내부 오류"
 
@@ -2074,11 +2083,38 @@ msgstr "빈 파일에 메모리 매핑할 수 없습니다"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "동적 메모리 매핑이 범위를 벗어났습니다"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "선택한 %s이(가) 없습니다"
@@ -2093,42 +2129,42 @@ msgstr "이 타입 줄임말을 알 수 없습니다: '%c'"
 msgid "Opening configuration file %s"
 msgstr "설정 파일 %s 파일을 여는 중입니다"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "문법 오류 %s:%u: 여기서 include됩니다"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
@@ -2195,7 +2231,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s 디렉토리로 이동할 수 없습니다"
@@ -2229,143 +2265,153 @@ msgstr "%s 잠금 파일을 얻을 수 없습니다"
 msgid "Waited for %s but it wasn't there"
 msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s 파일을 열 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "파일을 닫는 데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "파일을 지우는 데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "파일을 동기화하는 데 문제가 있습니다"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "패키지 캐시가 비어 있습니다"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "패키지 캐시 파일이 손상되었습니다"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "패키지 캐시가 다른 아키텍쳐용입니다."
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "의존"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "미리의존"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "제안"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "추천"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "충돌"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "대체"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "없앰"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "망가뜨림"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "중요"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "필수"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "표준"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "옵션"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "별도"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "의존성 트리를 만드는 중입니다"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "후보 버전"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "의존성 만들기"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "상태 정보를 읽는 중입니다"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "상태파일 %s 여는 데 실패했습니다"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "임시 상태파일 %s 쓰는 데 실패했습니다"
@@ -2453,7 +2499,7 @@ msgid ""
 msgstr ""
 "%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2461,11 +2507,11 @@ msgstr ""
 "오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수"
 "도 있습니다."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2473,24 +2519,24 @@ msgstr ""
 "일부 인덱스 파일을 다운로드하는 데 실패했습니다. 해당 파일을 무시하거나 과거"
 "의 버전을 대신 사용합니다."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "목록 디렉토리 %spartial이 빠졌습니다."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "아카이브 디렉토리 %spartial이 빠졌습니다."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "파일 받아오는 중: %2$li 중 %1$li"
@@ -2505,18 +2551,18 @@ msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
 msgid "Method %s did not start correctly"
 msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' 패키지 시스템을 지원하지 않습니다"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다"
 
@@ -2537,16 +2583,18 @@ msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다."
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 패키지 헤더가 없습니다"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
 
@@ -2689,6 +2737,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "크기가 맞지 않습니다"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "주의, %2$s 대신에 %1$s 패키지를 선택합니다\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2745,6 +2810,12 @@ msgid ""
 "zu signatures\n"
 msgstr "패키지 색인 %zu개, 소스 색인 %zu개, 번역 색인 %zu개, 서명 %zu개 발견\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2775,22 +2846,22 @@ msgstr "새 소스 리스트를 쓰는 중입니다\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "레코드 %i개를 썼습니다.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
@@ -2800,12 +2871,12 @@ msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상�
 msgid "Installing %s"
 msgstr "%s 설치하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "%s 설정 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "%s 패키지를 지우는 중입니다"
@@ -2815,62 +2886,83 @@ msgstr "%s 패키지를 지우는 중입니다"
 msgid "Running post-installation trigger %s"
 msgstr "설치 후 트리거 %s 실행하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "디렉토리 '%s' 없습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "%s 준비 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s 푸는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s 패키지를 설정할 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "%s의 트리거를 처리하는 중입니다"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s 설치"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s 패키지를 지울 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s 지움"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s 패키지를 완전히 지웠습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "목록 디렉토리를 잠글 수 없습니다"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "%s 파일을 열 수 없습니다"
@@ -2879,6 +2971,15 @@ msgstr "%s 파일을 열 수 없습니다"
 msgid "Connection closed prematurely"
 msgstr "연결이 너무 빨리 끊어졌습니다"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "%s의 트리거를 처리하는 중입니다"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "동적 메모리 매핑이 범위를 벗어났습니다"
+
 #~ 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"
diff --git a/po/ku.po b/po/ku.po
index f7fb37a0b..de3ef37d5 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-ku\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
 "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -18,155 +18,150 @@ msgstr ""
 "X-Generator: KAider 0.1\n"
 "Plural-Forms: nplurals=2; plural= n != 1;\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Pakêt nehate dîtin %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Navên paketan bi giştî :"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Pakêtên normal:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Pakêtên farazî yên safî:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Pakêta tenê ya farazî:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Pakêtên hevbeş yên farazî:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Winda: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Bindestên giştî:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Cihê giştî yê sist:"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Cihê giştî yê veqetandî: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakêta dosya %s li derveyî demê ye."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Pêwist e tu mînakekê bidî"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Pakêt nayên dîtin"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Pelgehên Pakêt:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(nehate dîtin)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Sazkirî: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(ne tiştek)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Berendam: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Destika pakêtê:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Tabloya guhertoyan:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ji bo %s %s komkirî di %s %s de\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -567,221 +562,221 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "E"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "lê %s sazkirî ye"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "lê sazkirina wê ne gengaz e"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "lê paketeke farazî ye"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "lê ne sazkirî ye"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "lê dê neyê sazkirin"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " û"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Ev pakêt dê werine RAKIRIN:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Ev paket dê werine bilindkirin:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (ji ber %s)"
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ji nû ve sazkirî,"
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu hatine nizmkirin."
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Bindestî tên serrastkirin..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " neserketî."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Nikare bindestiyan rast kirin"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Temam"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Pelrêça daxistinê nayê quflekirin"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Anîna %sB ji arşîvan pêwist e.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nikarî cihê vala li %s tesbît bike"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Cihê vala li %s têre nake."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Erê, wusa bike!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -789,74 +784,74 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Betal."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Dixwazî bidomînî [E/n]?"
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Anîna %s %s biserneket\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Daxistina çend pelan biserneket"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Sazkirin tê betalkirin."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Sazkirî]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -864,64 +859,69 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -937,49 +937,49 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Peywira %s nehate dîtin"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nikarî pakêta %s bibîne"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -987,152 +987,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Paketên şikestî"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Paketên tên pêşniyaz kirin:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Paketên tên tawsiyê kirin:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Bilindkirin tê hesibandin..."
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Serneket"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Temam"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Cihê vala li %s têre nake"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Çavkanîna %s bîne\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Anîna çend arşîvan biserneket."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, 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:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1148,7 +1148,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1176,6 +1176,14 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr ""
@@ -1394,9 +1402,9 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nikare %s bixwîne"
@@ -1622,7 +1630,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Çewiya xwendinê"
 
@@ -1634,7 +1642,7 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Çewtiya nivîsînê"
 
@@ -1688,7 +1696,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1773,39 +1781,39 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "Nikare bi %s re girêdan pêk bîne %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Di xebitandina gpgv de çewtiya nenas"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1821,82 +1829,82 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Hilbijartin neserketî"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 #, fuzzy
 msgid "Error writing to output file"
 msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Nivîsîna pelê %s biserneket"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Girêdan pêk nehatiye"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 
@@ -1909,11 +1917,38 @@ msgstr ""
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Hilbijartina %s nehatiye dîtin"
@@ -1928,42 +1963,42 @@ msgstr ""
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -2030,7 +2065,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Nivîsandin ji bo %s ne pêkane"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nikarî derbasa %s bike"
@@ -2064,143 +2099,152 @@ msgstr ""
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:457
 #, c-format
+msgid "Sub-process %s received signal %u."
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:460
+#, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nikarî pelê %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Bindest"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "PêşBindest"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Pêşniyaz dike"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Tawsiye dike"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Nakokî"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Dikeve şunve"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Kevin dike"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Dişkîne"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "girîng"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "pêwist"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opsiyonel"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Guhartoyên berendam"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Vekirina StateFile %s biserneket"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s ji hev nehate veçirandin"
@@ -2284,40 +2328,40 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Pel tê anîn %li ji %li"
@@ -2332,17 +2376,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2363,16 +2407,17 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
@@ -2510,6 +2555,21 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Mezinahî li hev nayên"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Pakêt nehate dîtin %s"
+
+#: apt-pkg/indexrecords.cc:47
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2564,6 +2624,12 @@ msgid ""
 "zu signatures\n"
 msgstr ""
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2594,22 +2660,22 @@ msgstr ""
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i tomar hatin nivîsîn.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2619,12 +2685,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "%s tê mîhengkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "%s tê rakirin"
@@ -2634,61 +2700,82 @@ msgstr "%s tê rakirin"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "%s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s tê derxistin"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Mîhengkirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "Di şixulandina pêrista %s de çewtî"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Rakirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Bi tevahî rakirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s bi tevahî hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the download directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Pelrêça daxistinê nayê quflekirin"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
@@ -2697,3 +2784,10 @@ msgstr "Danegira %s nehate vekirin: %s"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Girêdan zû hatiye girtin"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Di şixulandina pêrista %s de çewtî"
diff --git a/po/lt.po b/po/lt.po
index 8eb2c5adb..d3f58ff9b 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-08-02 01:47-0400\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -17,155 +17,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2008-08-02 05:04+0000\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paketas %s versijos numeriu %s turi netenkinamą priklausomybę:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 #, fuzzy
 msgid "Total package names: "
 msgstr "Visi paketų pavadinimai: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Normalūs paketai: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Pavieniai virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Mišrūs virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Trūksta: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Viso skirtingų versijų: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Viso skirtingų aprašymų: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Viso priklausomybių: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Viso versijų/failų santykių yra: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Viso aprašymų/failų santykių yra: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Paketų nerasta"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Paketų failai:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Surišti paketai:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(nerasta)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Įdiegta: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(nėra)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandidatas: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Paketo susiejimai: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Versijų lentelė:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -623,79 +618,79 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr "Nepavyko pervadinti %s į %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "T"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Šie paketai turi neįdiegtų priklausomybių:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "bet %s yra įdiegtas"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "bet %s bus įdiegtas"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "tačiau jis negali būti įdiegtas"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "bet tai yra virtualus paketas"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "bet jis nėra įdiegtas"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "bet jis nebus įdiegtas"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " arba"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Bus įdiegti šie NAUJI paketai:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Bus PAŠALINTI šie paketai:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Šių paketų atnaujinimas sulaikomas:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Bus atnaujinti šie paketai:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Bus pakeisti šie sulaikyti paketai:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (dėl %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -703,144 +698,144 @@ msgstr ""
 "Įspėjimas: Šie būtini paketai bus pašalinti.\n"
 "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu atnaujinti, %lu naujai įdiegti, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu įdiegti iš naujo, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu pasendinti, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Taisomos priklausomybės..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " nepavyko."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Nepavyko patenkinti priklausomybių"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, fuzzy
 msgid "Unable to minimize the upgrade set"
 msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Įvykdyta"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaidas."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Įdiegti šiuos paketus be patvirtinimo [t/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Nepavyko autentikuoti kai kurių paketų"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Nepavyko užrakinti parsiuntimų aplanko"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nepavyko perskaityti šaltinių sąrašo."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Keista.. Dydis neatitinka, Parašykite laišką apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Reikia parsiųsti %sB/%sB archyvų.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Reikia parsiųsti %sB archyvų.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nepavyko nustatyti %s laisvos vietos"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s nėra pakankamai laisvos vietos."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Taip, daryk kaip liepiu!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -851,28 +846,28 @@ msgstr ""
 "Jei norite tęsti, įveskite frazę „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Nutraukti."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ar norite tęsti [T/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nepavyko parsiųsti %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Nepavyko parsiųsti kai kurių failų"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Pavyko parsiųsti tik parsiuntimo režime"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -880,48 +875,48 @@ msgstr ""
 "Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ "
 "arba pabandykite su parametru --fix-missing?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Nepavyko pataisyti dingusių paketų."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Diegimas nutraukiamas."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Pastaba: pažymimas %s vietoje %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Paketas %s yra virtualus, pateiktas:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Įdiegtas]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Reikia pažymėti įdiegimui bent vieną."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -932,63 +927,68 @@ msgstr ""
 "Tai gali reikšti, kad paketas dingęs, nebenaudojamas \n"
 "arba prieinamas tik iš kitų šaltinių.\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Tačiau šie paketai jį pakeičia:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Paketas %s neturi diegimo kandidatų"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Pažymėta versija %s (%s) paketui %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Atnaujinimo komandai argumentų nereikia"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Nepavyko užrakinti sąrašo aplanko"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1004,43 +1004,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "Ši informacija gali padėti išspręsti šią situaciją:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nepavyko rasti užduoties %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1048,7 +1048,7 @@ msgstr ""
 "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
 "nurodytų paketų (arba nurodykite išeitį)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1060,115 +1060,115 @@ msgstr ""
 "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
 "pašalinti iš \"Incoming\" aplanko."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Sugadinti paketai"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Bus įdiegti šie papildomi paketai:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Siūlomi paketai:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Rekomenduojami paketai:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Skaičiuojami atnaujinimai... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Nepavyko"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Įvykdyta"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Neturite pakankamai laisvos vietos %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Parsiunčiamas archyvas %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Nepavyko gauti kai kurių arhcyvų."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Jau išpakuotas archyvas %s praleidžiama\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Klaida procese-palikuonyje"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1176,7 +1176,7 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1185,32 +1185,32 @@ msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
 "versijos %s paketo"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra "
 "per naujas"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nepavyko patenkinti %s priklausomybės %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Palaikomi moduliai:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1226,7 +1226,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1254,6 +1254,14 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Imamas "
@@ -1487,9 +1495,9 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nepavyko perskaityti %s"
@@ -1714,7 +1722,7 @@ msgstr "Jungiamasi per ilgai"
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Skaitymo klaida"
 
@@ -1726,7 +1734,7 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Rašymo klaida"
 
@@ -1780,7 +1788,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1864,38 +1872,38 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "Nepavyko prisijungti prie %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Nežinoma klaida kviečiant gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Šie parašai buvo nevalidūs:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1911,81 +1919,81 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Laukiama antraščių"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Prisijungimo laiko limitas baigėsi"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Klaida bandant rašyti į failą"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Nepavyko patikrinti %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Vidinė klaida"
 
@@ -1998,11 +2006,38 @@ msgstr ""
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
@@ -2017,42 +2052,42 @@ msgstr ""
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -2119,7 +2154,7 @@ msgid "Unable to stat the mount point %s"
 msgstr ""
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nepavyko pakeisti į %s"
@@ -2153,143 +2188,153 @@ msgstr "Nepavyko rezervuoti rakinimo failo %s"
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Procesas %s gavo segmentavimo klaidą"
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Procesas %s gavo segmentavimo klaidą"
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Procesas %s grąžino klaidos kodą (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Procesas %s netikėtai išėjo"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Klaida užveriant failą"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Klaida sinchronizuojant failą"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Priklauso"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Priešpriklauso"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Siūlo"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Rekomenduoja"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Konfliktuoja"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Pakeičia"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Pakeičia"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Sugadina"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "Svarbu"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "privaloma"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standartinis"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "nebūtinas"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "papildomas"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Konstruojamas priklausomybių medis"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Galimos versijos"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Priklausomybių generavimas"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Skaitoma būsenos informacija"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
@@ -2373,17 +2418,17 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2391,24 +2436,24 @@ msgstr ""
 "Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje "
 "jų panaudoti seni."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Parsiunčiamas %li failas iš %li (liko %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Parsiunčiamas %li failas iš %li"
@@ -2423,17 +2468,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2456,16 +2501,17 @@ msgstr ""
 "Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų "
 "ištaisytos"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
@@ -2603,6 +2649,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Neatitinka dydžiai"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to open DB file %s: %s"
+msgid "Unable to parse Release file %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2657,6 +2720,12 @@ msgid ""
 "zu signatures\n"
 msgstr ""
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2687,22 +2756,22 @@ msgstr "Rašomas naujas šaltinių sąrašas\n"
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2712,12 +2781,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Įdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigūruojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Šalinamas %s"
@@ -2727,61 +2796,82 @@ msgstr "Šalinamas %s"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Ruošiamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Išpakuojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Ruošiamasi konfigūruoti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Apdorojami %s trigeriai"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Įdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Ruošiamasi %s pašalinimui"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Ruošiamasi visiškai pašalinti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Visiškai pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nepavyko užrakinti sąrašo aplanko"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""
@@ -2790,6 +2880,12 @@ msgstr ""
 msgid "Connection closed prematurely"
 msgstr ""
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Apdorojami %s trigeriai"
+
 #~ 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"
diff --git a/po/mr.po b/po/mr.po
index 12a2575c3..5d2a3a5f2 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-11-20 23:27+0530\n"
 "Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -15,153 +15,148 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "पॅकेज %s आवृती %s मध्ये एक अनोळखी डीईपी:आहे\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "पॅकेज %s शोधण्यास असमर्थ आहे"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "पॅकेजची सर्व नांवे: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr " सामान्य पॅकेजेस्: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr " शुध्द आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr " एकमेव आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "मिश्रित आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr " हरवलेले/गहाळ: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "एकूण स्पष्ट आवृत्या: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "एकूण स्पष्ट विवरणे: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "एकूण निर्भरता:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "एकूण व्हीईआर/संचिका परस्पर संबंध:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "एकूण विव/संचिका परस्पर संबंध:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "एकूण मॅपींगस् तरतूद: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "एकूण एकत्रित अक्षरसंच:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "एकूण परावलंबित आवृत्ती अवकाश:"
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "एकूण दुर्लक्षित अवकाश:"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):"
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत"
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "पॅकेजेस सापडले नाहीत"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "पॅकेज संचिका:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "दृतिका सिंक नाही,पॅकेज संचिका क्ष-संदर्भ करता येत नाही"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "एकत्रित पॅकेजेस:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(मिळाले नाही)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "अधिष्ठापित केले:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(कोणताच नाही)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "उमेदवार:"
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "पॅकेज (पिन):"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "आवृत्ती कोष्टक:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -648,79 +643,79 @@ msgstr "%s दुवा मोकळा/सुटा करण्यास अ�
 msgid "Failed to rename %s to %s"
 msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "होय"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "पण %s संस्थापित झाले"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "पण %s संस्थापित करायचे आहे"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "पण ते संस्थापित करण्याजोगे नाही"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "पण ते आभासी पॅकेज आहे"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "पण ते संस्थापित केले नाही"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "पण ते संस्थापित होणार नाही"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr "किंवा"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "खालील पॅकेजेस परत ठेवली गेली:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (च्या मुळे %s)"
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -728,143 +723,143 @@ msgstr ""
 "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
 "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu पुनर्संस्थापित केले,"
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu मागील आवृत्तीकृत केले,"
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr "अयशस्वी/चूकीचे झाले."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr "झाले"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?"
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर  संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे"
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "किती विचित्र...आकार जुळत नाहीत, ईमेल apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "अर्काईव्हजच्या %sB/%sB घेण्याची गरज आहे\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "अर्काईव्हज%sB घेण्याची गरज आहे.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "या क्रियेनंतर, %sB एवढी अधिक डिस्क जागा वापरली जाईल.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही."
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "हो, मी म्ह्टल्याप्रमाणे करा!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -875,28 +870,28 @@ msgstr ""
 "पुढे '%s' उक्ती मध्ये लिहिणार \n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "व्यत्यय/बंद करा."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s आणणे असफल\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -904,48 +899,48 @@ msgstr ""
 "काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- "
 "बरोबर प्रयत्न कराहरवलेले/गहाळ?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "संस्थापन खंडित करत आहे."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s हे आभासी पॅकेज ह्यांच्याकडून तरतूद केले आहे,:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr "[संस्थापित केले]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "तुम्ही संस्थापित करण्यासाठी एक निश्चित स्पष्टपणे निवडले पाहिजे."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -956,63 +951,68 @@ msgstr ""
 "याचा अर्थ असाही आहे की पॅकेज सापडत नाही,ते कालबाह्य किंवा \n"
 " म्हणजे ते दुसऱ्या उगमातून उपलब्ध\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "तथापि खालील पॅकेजेस मध्ये बदल झाला:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "%s पॅकेजला संस्थापित कॅन्डिडेट नाही"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1030,45 +1030,45 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "%s कार्य सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
 "लागेल'यात बदल करण्यासाठी:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1076,7 +1076,7 @@ msgstr ""
 "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
 "(किंवा पर्याय सांगा)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1088,122 +1088,122 @@ msgstr ""
 "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
 "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "तुटलेली पॅकेजेस"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "सुचवलेली पॅकेजेस:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "शिफारस केलेली पॅकेजेस:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "असमर्थ"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "झाले"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s मध्ये पुरेशी जागा नाही"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s उगम घ्या\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "चाईल्ड प्रक्रिया अयशस्वी"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1212,30 +1212,31 @@ msgstr ""
 "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
 "डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1251,7 +1252,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1319,6 +1320,14 @@ msgstr ""
 " apt.conf(5)  पुस्तिका पाने पहा.\n"
 "         ह्या APT ला सुपर काऊ पॉवर्स आहेत\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "दाबा"
@@ -1549,9 +1558,9 @@ msgstr "%s च्या आवृत्तीशी पुनः लिहिल
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "File %s/%s, %s पॅकेज मधल्या एका वर पुनर्लिखित होते"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s वाचण्यास असमर्थ"
@@ -1782,7 +1791,7 @@ msgstr "वेळेअभावी संबंध जोडता येत �
 msgid "Server closed the connection"
 msgstr "सर्व्हरने संबंध जोडणी बंद केली"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "त्रुटी वाचा"
 
@@ -1794,7 +1803,7 @@ msgstr "प्रतिसाधाने बफर भरुन गेले."
 msgid "Protocol corruption"
 msgstr "प्रोटोकॉल खराब झाले"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "लिहिण्यात त्रुटी"
 
@@ -1848,7 +1857,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी
 msgid "Unable to accept connection"
 msgstr "जोडणी स्विकारण्यास असमर्थ"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "फाईल हॅश करण्यात त्रुटी"
 
@@ -1932,40 +1941,40 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s ला जोडण्यास असमर्थ:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "किमान एक अवैध सही सापडली."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "खालील सह्या अवैध आहेत:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1981,80 +1990,80 @@ msgstr "%s साठी पाईप उघडता येत नाही"
 msgid "Read error from %s process"
 msgstr "%s क्रियेपासून चूक वाचा"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "शीर्षकासाठी थांबले आहे...."
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u अक्षरांवर एक शीर्षक ओळ मिळाली"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "वाईट शीर्षक ओळ"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले "
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "चुकले/असमर्थ निवड करा"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "जोडणी वेळेअभावी तुटली"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "सर्व्हर मधून वाचण्यात चूक"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "फाईल छोटी करणे असफल"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "चुकीचा शीर्षक डाटा"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "जोडणी अयशस्वी"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "अंतर्गत त्रुटी"
 
@@ -2067,11 +2076,38 @@ msgstr "रिकामी फाईल mmap करता येणार ना
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamic MMap ला ज आगा कमी पडली"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s निवडक भाग सापडत नाही"
@@ -2086,42 +2122,42 @@ msgstr "संक्षिप्तरुपाचा माहित नसल�
 msgid "Opening configuration file %s"
 msgstr "%s संरचना फाईल उघडत आहे"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "रचनेच्या नियमांचा दोष %s:%u: मुल्यांच्या नंतर अधिक जंक"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "रचनेच्या नियमांचा दोष %s:%u: खूपच एकात एक इनक्लूडस्"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून  समाविष्ट "
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर्शक असहाय्यकारी"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक"
@@ -2188,7 +2224,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "%s माऊंट पॉईंट स्टॅट करण्यास असमर्थ"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s मध्ये बदलण्यास असमर्थ"
@@ -2222,143 +2258,153 @@ msgstr "%s कुलुप मिळवता येत नाही"
 msgid "Waited for %s but it wasn't there"
 msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s फाईल उघडता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "फाईल बंद करण्यात अडचण"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "फाईल अनलिंकिंग करण्यात अडचण"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "संचिकेची syncing समस्या"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "पॅकेज अस्थाई स्मृतिकोष"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "अवलंबित"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "पूर्व अवलंबित"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "सुचवणे"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "शिफारस"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "परस्परविरोध"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "परत त्याठिकाणी आणा"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "अप्रचलित"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "तोडले"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "अत्यावश्यक"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "एच्छिक"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "अधिक"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "अवलंबित रचना बांधणी करत आहे"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "कंॅडिडेट आवृत्त्या"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "अवलंबित/विसंबून असलेले उत्पादन "
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "स्थिती माहिती वाचत आहे"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "%s StateFile उघडणे असफल"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
@@ -2446,7 +2492,7 @@ msgid ""
 msgstr ""
 "%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2454,11 +2500,11 @@ msgstr ""
 "दोष,पॅकेज समस्या निवारक::निवारण  करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित  "
 "पॅकेजेस असू शकते."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2466,24 +2512,24 @@ msgstr ""
 "काही अनुक्रमणिका संचयिका डाऊनलोड    करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा "
 "त्याऐवजी जुन्या वापरल्या गेल्या."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "संचयिका यादीत %s पार्शल हरवले आहे."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे"
@@ -2498,17 +2544,17 @@ msgstr "%s कार्यपध्दतीचा ड्राइव्हर �
 msgid "Method %s did not start correctly"
 msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ "
 
@@ -2529,16 +2575,18 @@ msgstr "पॅकेजच्या याद्या किंवा संच
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी  apt-get update प्रोग्राम चालू करु शकता"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही "
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "%s पिनचा प्रकार समजलेला नाही"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही"
 
@@ -2687,6 +2735,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "आकार जुळतनाही"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2745,6 +2810,12 @@ msgstr ""
 "%zu पॅकेजेसची यादी/सूची, %zu स्त्रोताची यादी/सूची, %zu भाषांतर यादी/सूची आणि %zu "
 "स्वाक्षऱ्या/सिगनेचर्स सापडल्या\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2775,22 +2846,22 @@ msgstr "नविन स्त्रोत सूची लिहित आह�
 msgid "Source list entries for this disc are:\n"
 msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i माहितीसंच लिहिले.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच  लिहिले.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
@@ -2800,12 +2871,12 @@ msgstr "%i गहाळ संचिकाबरोबर आणि %i विज
 msgid "Installing %s"
 msgstr "%s संस्थापित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "%s संरचित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "%s काढून टाकत आहे"
@@ -2815,61 +2886,82 @@ msgstr "%s काढून टाकत आहे"
 msgid "Running post-installation trigger %s"
 msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' संचयिका गहाळ आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "%s तयार करित आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s सुटे/मोकळे करीत आहे "
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s संरचने साठी तयार करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "%s करिता ट्रिगर्स प्रक्रिया करत आहे"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s संस्थापित झाले"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "सत्रनोंद लिहिता येत नाही, openpty() असफल (/dev/pts आरोहित नाही?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "फाईल पॅच करता आली नाही"
@@ -2878,6 +2970,15 @@ msgstr "फाईल पॅच करता आली नाही"
 msgid "Connection closed prematurely"
 msgstr "जोडणी अकाली बंद झाली"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "%s करिता ट्रिगर्स प्रक्रिया करत आहे"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamic MMap ला ज आगा कमी पडली"
+
 #~ 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"
diff --git a/po/nb.po b/po/nb.po
index 4f4d49995..0ecafae9d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,14 +7,14 @@
 # Axel Bojer <axelb@skolelinux.no>, 2003-2004.
 # Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
 # Bjorn Steensrud <bjornst@powertech.no>, 2004.
-# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2008.
+# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-17 02:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-02-01 18:26+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
 "MIME-Version: 1.0\n"
@@ -22,154 +22,149 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Klarer ikke � finne pakken %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Plassmengde pakkenavn: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Vanlige pakker: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Rent virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Sammensatte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Mangler: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Antall unike versjoner: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Antall unike beskrivelser: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Antall avhengighetsforhold: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Antall forhold versjon/fil: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Antall forhold beskrivelse/fil: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Antall tilbudte tilknyttinger: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Antall utvidede strenger: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Total plass for avhengighetsforhold/versjoner: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Plass brukt av slark: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Samlet mengde redegjort plass: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ikke oppdatert."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Du m� oppgi n�yaktig ett m�nster"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Fant ingen pakker"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "L�ste pakker:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(ikke funnet)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(ingen)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Pakke l�st til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s kompilert p� %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -658,79 +653,79 @@ msgstr "Problem ved oppheving av lenken til %s"
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikke � endre navnet p� %s til %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Kompileringsfeil i regul�rt uttrykk - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "F�lgende pakker har uinnfridde avhengighetsforhold:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installeres"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "men lar seg ikke installere"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "men er en virtuell pakke"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "men er ikke installert"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "men skal ikke installeres"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "F�lgende NYE pakker vil bli installert:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "F�lgende pakker vil bli FJERNET:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "F�lgende pakker er holdt tilbake:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "F�lgende pakker vil bli oppgradert:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "F�lgende pakker vil bli NEDGRADERT:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "F�lgende pakker vil bli endret:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (pga. %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -738,146 +733,146 @@ msgstr ""
 "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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nylig installerte, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installert p� nytt, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu � fjerne og %lu ikke oppgradert.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Retter p� avhengighetsforhold ..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " mislyktes."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Klarer ikke � rette p� avhengighetsforholdene"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Klarer ikke � minimere oppgraderingsettet"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Utf�rt"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Uinnfridde avhengighetsforhold - Pr�v �-f�."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: F�lgende pakker ble ikke autentisert!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Autentiseringsadvarsel overstyrt.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installer disse pakkene uten verifikasjon [j/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Noen pakker ble ikke autentisert"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med �delagte pakker!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakker trenges � fjernes, men funksjonen er sl�tt av."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil, sortering fullf�rte ikke"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke � l�se nedlastingsmappa"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Kan ikke lese kildlista."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "M� hente %sB/%sB med arkiver.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "M� hente %sB med arkiver.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Klarte ikke bestemme ledig plass i %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Dessverre, ikke nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Ja, gj�r som jeg sier!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -888,28 +883,28 @@ msgstr ""
 "For � fortsette skriv inn teksten �%s�\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Avbryter."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsette [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke � skaffe %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Noen av filene kunne ikke lastes ned"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Nedlasting fullf�rt med innstillinga �bare nedlasting�"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -917,48 +912,48 @@ msgstr ""
 "Klarte ikke � hente alle arkivene. Du kan pr�ve med �apt-get update� eller �--"
 "fix-missing�."
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Klarer ikke � rette p� manglende pakker."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Avbryter istallasjonen."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Merk, velger %s istedenfor %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Installert]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Du m� velge en pakke som skal installeres."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -969,63 +964,68 @@ msgstr ""
 "Dette kan bety at pakken mangler, er utg�tt, eller bare finnes \n"
 "tilgjengelig fra en annen kilde.\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "F�lgende pakker erstatter den imidlertid:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Pakken %s har ingen installasjonskandidat"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Utgave �%s� av �%s� ble ikke funnet"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versjon �%s� av �%s� ble ikke funnet"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Utvalgt versjon %s (%s) for %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Oppdaterings-kommandoen tar ingen argumenter"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Kan ikke l�se listemappa"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "F�lgende pakker ble automatisk installert og er ikke lenger p�krevet:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Bruk �apt-get autoremove� for � fjerne dem."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1043,43 +1043,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil, autofjerneren (AutoRemover) �dela noe"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil - �AllUpgrade� �dela noe"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Klarte ikke � finne oppgave %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke � finne pakken %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s satt til manuell installasjon.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1087,7 +1087,7 @@ msgstr ""
 "Uinnfridde avhengighetsforhold. Pr�v �apt-get -f install� uten pakker (eller "
 "angi en l�sning)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1099,122 +1099,122 @@ msgstr ""
 "at visse kjernepakker enn� ikke er laget eller flyttet ut av �Incoming� for\n"
 "distribusjonen."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "�delagte pakker"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "F�lgende ekstra pakker vil bli installert."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Foresl�tte pakker:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Anbefalte pakker"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Beregner oppgradering... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Mislyktes"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Utf�rt"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil, probleml�ser �dela noe"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke � finne en kildekodepakke for %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hopper over allerede nedlastet fil �%s�\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Trenger � skaffe %sB fra kildekodearkivet.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke � skaffe alle arkivene."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen �%s� mislyktes.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Sjekk om pakken �dpkg-dev� er installert.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen �%s� mislyktes.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, 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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1223,32 +1223,33 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke � tilfredsstille %s avhengighet for %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke � tilfredstille bygg-avhengighetene for %s."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke � behandle forutsetningene for bygging"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "St�ttede moduler:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1264,7 +1265,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1332,6 +1333,14 @@ msgstr ""
 "for mer informasjon og flere innstillinger\n"
 "                       Denne APT har kraften til en Superku.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Funnet "
@@ -1563,9 +1572,9 @@ msgstr "Skriver over pakketreff uten versjon for %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarer ikke � lese %s"
@@ -1802,7 +1811,7 @@ msgstr "Tidsavbrudd p� forbindelsen"
 msgid "Server closed the connection"
 msgstr "Tjeneren lukket forbindelsen"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lesefeil"
 
@@ -1814,7 +1823,7 @@ msgstr "Et svar oversv�mte bufferen."
 msgid "Protocol corruption"
 msgstr "Protokoll�deleggelse"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Skrivefeil"
 
@@ -1868,7 +1877,7 @@ msgstr "Tidsavbrudd p� tilkoblingen til datasokkelen"
 msgid "Unable to accept connection"
 msgstr "Klarte ikke � godta tilkoblingen"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av n�kkel for fil"
 
@@ -1952,39 +1961,39 @@ msgstr "Noe galt skjedde ved oppslag av �%s:%s� (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Klarte ikke � koble til %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Klarte ikke � sl� opp i n�kkelring; �%s�"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Intern feil: God signatur, men kunne bestemme n�kkelfingeravtrykk?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ugyldig signatur ble funnet."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Klarte ikke kj�re �%s� for � verifisere signaturen (er gpgv installert?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Ukjent feil ved kj�ring av gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "De f�lgende signaturene var ugyldige:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2002,80 +2011,80 @@ msgstr "Klarte ikke � �pne r�r for %s"
 msgid "Read error from %s process"
 msgstr "Lesefeil fra %s-prosessen"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Venter p� hoder"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fikk en enkel hodelinje over %u tegn"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "�delagt hodelinje"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tjeneren sendte et ugyldig �Content-Length�-hode"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tjeneren sendte et ugyldig �Content-Range�-hode"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tjeneren har �delagt st�tte for omr�de"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Ukjent datoformat"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Utvalget mislykkes"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Tidsavbrudd p� forbindelsen"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Klarte ikke forkorte fila %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "�delagte hodedata"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -2088,11 +2097,40 @@ msgstr "Kan ikke utf�re mmap p� en tom fil"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Kunne ikke lage mmap av %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamisk MMap gikk tom for minne"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamisk MMap gikk tom for minne. �k st�rrelsen p� APT::Cache-Limit. "
+"N�v�rende verdi: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fant ikke utvalget %s"
@@ -2107,42 +2145,42 @@ msgstr "Ukjent typeforkortelse: �%c�"
 msgid "Opening configuration file %s"
 msgstr "�pner oppsettsfila %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksfeil %s:%u: Blokka starter uten navn."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaksfeil %s:%u: Feil p� taggen"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det �verste niv�et"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaksfeil %s:%u: For mange n�stede inkluderte filer"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaksfeil %s:%u: Inkludert herfra"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksfeil %s:%u: Direktivet �%s� er ikke st�ttet"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaksfeil %s:%u: Ugyldige angivelser p� slutten av fila"
@@ -2209,7 +2247,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Klarer ikke � fastsette monteringspunktet %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Klarer ikke � endre %s"
@@ -2243,143 +2281,153 @@ msgstr "F�r ikke l�st %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventet p� %s, men den ble ikke funnet"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok et minnefeilsignal."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Underprosessen %s mottok et minnefeilsignal."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s ga en feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avsluttet uventet"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunne ikke �pne fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lese, har fremdeles %lu igjen � lese, men ingen igjen"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "skrive, har fremdeles %lu igjen � skrive, men klarte ikke �"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problem ved l�sing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problem ved oppheving av lenke til fila"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problem ved oppdatering av fila"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Pakkens lagerfil er �delagt"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denne APT st�tter ikke versjonssystemet �%s�"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret ble bygd for en annen arkitektur"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Avhenger av"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Forutsetter"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Foresl�r"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Anbefaler"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Er i konflikt med"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Nuller"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "�delegger"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "p�krevet"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "vanlig"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "valgfri"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Skaper oversikt over avhengighetsforhold"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Versjons-kandidater"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Oppretter avhengighetsforhold"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Leser tilstandsinformasjon"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Klarte ikke � �pne StateFile %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Klarte ikke � skrive midlertidig StateFile %s"
@@ -2467,7 +2515,7 @@ msgid ""
 msgstr ""
 "Pakka %s trenger � installeres p� nytt, men jeg finner ikke lageret for den."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2475,11 +2523,11 @@ msgstr ""
 "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
 "som holdes tilbake."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Klarer ikke � rette problemene, noen �delagte pakker er holdt tilbake."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2487,24 +2535,24 @@ msgstr ""
 "Klarte ikke � laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
 "ble brukt isteden. "
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Listemappa %spartial mangler."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Arkivmappa %spartial mangler."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Henter fil %li av %li (%s gjenv�rende)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Henter fil %li av %li"
@@ -2519,17 +2567,17 @@ msgstr "Finner ikke metode-driveren %s."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startet ikke korrekt"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Sett inn disken merket �%s� i lagringsenheten �%s� og trykk Enter."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet �%s� st�ttes ikke"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarer ikke bestemme en passende pakkesystemtype"
 
@@ -2552,16 +2600,18 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Det kan hende du vil kj�re �apt-get update� for � rette p� disse problemene"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Forsto ikke spikring av typen %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) spesifisert for pin"
 
@@ -2704,6 +2754,23 @@ msgstr "Oversiktsfilene er �delagte. Feltet �Filename:� mangler for pakken %s."
 msgid "Size mismatch"
 msgstr "Feil st�rrelse"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Klarer ikke � fortolke pakkefila %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Merk, velger %s istedenfor %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2762,6 +2829,12 @@ msgstr ""
 "Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu "
 "signaturer\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2792,22 +2865,22 @@ msgstr "Skriver ny kildeliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Kildelisteoppf�ringer for denne CD-en er:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i feile filer.\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, 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"
@@ -2817,12 +2890,12 @@ msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Setter opp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
@@ -2832,61 +2905,82 @@ msgstr "Fjerner %s"
 msgid "Running post-installation trigger %s"
 msgstr "Kj�rer etter-installasjonsutl�ser %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappa �%s� mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Forbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker ut %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Forbereder oppsett av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Behandler utl�sere for %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Installerte %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Forbereder fjerning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Forbereder � fullstendig slette %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kan ikke l�se listemappa"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kunne ikke �pne fila %s"
@@ -2895,6 +2989,15 @@ msgstr "Kunne ikke �pne fila %s"
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen ble uventet stengt"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Behandler utl�sere for %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamisk MMap gikk tom for minne"
+
 #~ 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"
diff --git a/po/ne.po b/po/ne.po
index 7563fb3ef..8b49e7aef 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -16,192 +16,151 @@ msgstr ""
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "प्याकेज %s संस्करण %s संग एउटा नभेटिएको dep छ:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "प्याकेज %s तोक्न असक्षम भयो"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  सामान्य प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "शुद्ध अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  एकल अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  मिश्रित अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  हराइरहेको:"
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "कूल निर्भरताहरू:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "कूल उपलब्ध मानचित्रणहरू:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:"
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "कूल शिथिल खाली ठाऊँ:"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "को लागि कूल खाली ठाऊँ लेखांकन:"
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।"
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "कुनै प्याकेजहरू फेला परेन"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "प्याकेज फाइलहरू:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "क्यास sync  भन्दा बाहिर छ, प्याकेज फाइल x-ref गर्न सक्दैन"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "पिन गरिएका प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(फेला परेन)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  स्थापना भयो:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(कुनै पनि होइन)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  उमेद्वार:"
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "प्याकेज पिन:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  संस्करण तालिका:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -689,79 +648,79 @@ msgstr "समस्या अनलिङ्क भइरहेछ %s"
 msgid "Failed to rename %s to %s"
 msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "तर %s स्थापना भयो"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "तर यो स्थापनायोग्य छैन"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "तर यो अवास्तविक प्याकेज होइन"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "तर यो स्थापना भएन"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "तर यो स्थापना हुन गइरहेको छैन"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr "वा"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s कारणले) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -769,143 +728,143 @@ msgstr ""
 "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
 "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu पुन: स्थापना गरियो, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu स्तर कम गरियो, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "निर्भरताहरू सुधार गरिदैछ..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr "असफल भयो ।"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr "काम भयो"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "यी सुधार गर्न तपाईँले `apt-get -f install' चलाउन पर्छ ।"
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! "
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।"
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, apt@packages.debian.org इमेल गर्नुहोस्"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक ।\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "संग्रहहरुको %sB प्राप्त गर्न आवश्यक ।\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %sB प्रयोग हुनेछ ।\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।"
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "हो,मैले भने जस्तै गर्नुहोस्!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -916,28 +875,28 @@ msgstr ""
 "निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "परित्याग गर्नुहोस् ।"
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s तान्न असफल भयो\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -945,47 +904,47 @@ msgstr ""
 "केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास "
 "गर्नुहुन्छ ?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।"
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "स्थापना परित्याग गरिदैछ ।"
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "प्याकेज %s ...द्वारा उपलब्ध गराइएको अवास्तविक प्याकेज हो:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [स्थापना भयो]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "तपाईँले स्थापना गर्न स्पष्ट रुपमा एउटा चयन गर्नुहोस् ।"
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -996,64 +955,69 @@ msgstr ""
 "यसको मतलब प्याकेज हराइरहेको प्याकेज, बेकायम भयो\n"
 " अर्को स्रोतबाट मात्र उपलब्ध हुन्छ\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "जे भए पनि निम्न प्याकेजहरूले यसलाई बदल्छ:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "प्याकेज %s संग कुनै स्थापना उमेद्वार छैन"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1069,44 +1033,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1114,7 +1078,7 @@ msgstr ""
 "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
 "समाधान निर्दिष्ट गर्नुहोस्) ।"
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1127,122 +1091,122 @@ msgstr ""
 " वितरण अहिले सम्म सिर्जना\n"
 " भएको छैन वा आवगमन विनानै सर्यो ।"
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "भाँचिएका प्याकेजहरू"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "सुझाव दिएका प्याकेजहरू:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "सिफारिस गरिएका प्याकेजहरू:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "स्तर वृद्धि गणना गरिदैछ..."
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "असफल भयो"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "काम भयो"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "स्रोत फड्काउनुहोस् %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "केही संग्रह फड्काउन असफल भयो ।"
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "शाखा प्रक्रिया असफल भयो"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1251,30 +1215,30 @@ msgstr ""
 "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
 "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1291,7 +1255,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1357,6 +1321,14 @@ msgstr ""
 "pages हेर्नुहोस् ।\n"
 "                       APT संग सुपर काउ शक्तिहरू छ ।\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "हान्नुहोस्"
@@ -1587,9 +1559,9 @@ msgstr " %s को लागि संस्करन बिना अधिल�
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s पढ्न असफल भयो"
@@ -1820,7 +1792,7 @@ msgstr "जडान समय सकियो"
 msgid "Server closed the connection"
 msgstr "सर्भरले जडान बन्द गर्यो"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "त्रुटि पढ्नुहोस्"
 
@@ -1832,7 +1804,7 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि
 msgid "Protocol corruption"
 msgstr "प्रोटोकल दूषित"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "त्रुटि लेख्नुहोस्"
 
@@ -1886,7 +1858,7 @@ msgstr "डेटा सकेटको जडान समय सकियो"
 msgid "Unable to accept connection"
 msgstr "जडान स्वीकार गर्न असक्षम भयो"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "समस्या द्रुतान्वेषण फाइल"
 
@@ -1970,38 +1942,38 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s मा जडान गर्न असफल भयो:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।"
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2017,81 +1989,81 @@ msgstr "%s को लागि पाइप खोल्न सकिएन"
 msgid "Read error from %s process"
 msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् "
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "हेडरहरुको लागि पर्खिदैछ"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr " %u chars माथि एकल हेडर लाइन प्राप्त गर्नुहोस्"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "खराब हेडर लाइन"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "अज्ञात मिति ढाँचा"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "असफल चयन गर्नुहोस्"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "जडान समय सकियो"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "सर्भरबाट त्रुटि पढिदैछ"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "फाइल %s लेख्न असफल भयो"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
@@ -2104,11 +2076,38 @@ msgstr "एउटा खाली फाइल mmap बनाउन सकिए
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "चयन %s फेला पार्न सकिएन"
@@ -2123,42 +2122,42 @@ msgstr "नचिनिएको टाइप संक्षिप्त रु
 msgid "Opening configuration file %s"
 msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।"
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "वाक्य संरचना त्रुटि %s:%u: यहाँ बाट समावेश गरेको"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक"
@@ -2225,7 +2224,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "माउन्ट बिन्दु %s स्थिर गर्न असक्षम"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s मा परिवर्तन गर्न असक्षम"
@@ -2259,144 +2258,154 @@ msgstr "ताल्चा प्राप्त गर्न सकिएन %s
 msgid "Waited for %s but it wasn't there"
 msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "फाइल बन्द गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "फाइल अनलिङ्क गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "फाइल गुप्तिकरण गर्दा समस्या"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "खाली प्याकेज क्यास"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "आधारित"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "पुन:आधारित"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "सुझाव दिन्छ"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "सिफारिस गर्दछ"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "द्वन्दहरू"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "बदल्छ"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "वेकायमहरू"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "महत्वपूर्ण"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "वैकल्पिक"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "अतिरिक्त"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "निर्भरता ट्री निर्माण गरिदैछ"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "उमेद्वार संस्करणहरू"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "निर्भरता सिर्जना"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 #, fuzzy
 msgid "Reading state information"
 msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "%s खोल्न असफल"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "फाइल %s लेख्न असफल भयो"
@@ -2483,7 +2492,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।"
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2491,11 +2500,11 @@ msgstr ""
 "त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको "
 "कारणले गर्दा हो ।"
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2503,24 +2512,24 @@ msgstr ""
 "केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो "
 "एउटा प्रयोग गरियो ।"
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ"
@@ -2535,17 +2544,17 @@ msgstr "विधि ड्राइभर %s फेला पार्न स�
 msgid "Method %s did not start correctly"
 msgstr "विधि %s सही रुपले सुरू हुन सकेन"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो"
 
@@ -2566,16 +2575,18 @@ msgstr "प्याकेज सूचीहरू वा वस्तुस्
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "पिन टाइप %s बुझ्न सकिएन "
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
 
@@ -2719,6 +2730,23 @@ msgstr "प्याकेज अनुक्रमणिका फाइलह�
 msgid "Size mismatch"
 msgstr "साइज मेल खाएन"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2776,6 +2804,12 @@ msgid ""
 "zu signatures\n"
 msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i  हस्ताक्षरहरू फेला परे\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
@@ -2806,22 +2840,22 @@ msgstr "नयाँ स्रोत सूचि लेखिदैछ\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i रेकर्डहरू लेखियो ।\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
@@ -2831,12 +2865,12 @@ msgstr "हराइरहेको फाइल %i हरू र मेल न�
 msgid "Installing %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr " %s कनफिगर गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr " %s हटाइदैछ"
@@ -2846,61 +2880,82 @@ msgstr " %s हटाइदैछ"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr " %s तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s अनप्याक गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr " %s कनफिगर गर्न तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr " %s हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr " %s हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
@@ -2910,6 +2965,13 @@ msgstr "फाइल %s खोल्न सकिएन"
 msgid "Connection closed prematurely"
 msgstr "जडान असमायिक बन्द भयो"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
+
 #~ 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"
diff --git a/po/nl.po b/po/nl.po
index 58785fb5f..1155852f6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-05-05 18:39+0200\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -16,190 +16,149 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Dutch\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kan pakket %s niet vinden"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Totaal aantal pakketnamen: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Normale pakketten: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr " Zuiver virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Losstaande virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Gemengde virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Ontbrekend: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Totaal aantal verschillende versies: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Totaal aantal verschillende beschrijvingen: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Totaal aantal vereisten: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Totaal aantal versie/bestand-relaties: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Totaal aantal Beschrijving/bestand-relaties: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Totaal aantal 'Voorziet'-toewijzingen "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Totaal aantal geglobde strings: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Totale hoeveelheid vereisten-versieruimte: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Totale onbenutte ruimte: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Totale hoeveelheid verantwoorde ruimte: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "U dient precies één patroon op te geven"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Geen pakketten gevonden"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Pakketbestanden:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Vastgepinde pakketten:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(niet gevonden)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Geïnstalleerd: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(geen)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandidaat: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Pakketpin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Versietabel:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s voor %s gecompileerd op %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -694,79 +653,79 @@ msgstr "Probleem bij het ontlinken van %s"
 msgid "Failed to rename %s to %s"
 msgstr "Hernoemen van %s naar %s is mislukt"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-compilatiefout - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "De volgende pakketten hebben niet-voldane vereisten:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "maar %s is geïnstalleerd"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "maar %s zal geïnstalleerd worden"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "maar het is niet installeerbaar"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "maar het is een virtueel pakket"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "maar het is niet geïnstalleerd"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "maar het zal niet geïnstalleerd worden"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " of"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "De volgende pakketten zullen VERWIJDERD worden:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "De volgende pakketten zijn achtergehouden:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "De volgende pakketten zullen opgewaardeerd worden:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (vanwege %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -774,146 +733,146 @@ msgstr ""
 "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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu opnieuw geïnstalleerd, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu gedegradeerd, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Vereisten worden gecorrigeerd..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " mislukt."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Kan vereisten niet corrigeren"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Klaar"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 "WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Authentificatiewaarschuwing is genegeerd.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Sommige pakketten konden niet geauthentificeerd worden"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interne fout, rangschikken is niet voltooid"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Kon de ophaalmap niet vergrendelen"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "De lijst van bronnen kon niet gelezen worden."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, 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:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "U heeft onvoldoende vrije schijfruimte op %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Ja, doe wat ik zeg!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -924,28 +883,28 @@ msgstr ""
 "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Afbreken."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Wilt u doorgaan [J/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ophalen van %s %s is mislukt\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Ophalen van sommige bestanden is mislukt"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -953,49 +912,49 @@ msgstr ""
 "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
 "fix-missing proberen?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Geen oplossing voor de missende pakketten gevonden."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Installatie wordt afgebroken."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, 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:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Geïnstalleerd]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "U dient er één expliciet te selecteren voor installatie."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1006,54 +965,59 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Echter, de volgende pakketten vervangen dit:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Pakket %s heeft geen installeerbare kandidaat"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s is reeds de nieuwste versie.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' voor '%s' is niet gevonden"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versie '%s' voor '%s' is niet gevonden"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versie %s (%s) geselecteerd voor %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "De 'update'-opdracht aanvaard geen argumenten"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Kon de lijst-map niet vergrendelen"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1061,11 +1025,11 @@ msgstr ""
 "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
 "nodig:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "U kunt deze verwijderen via 'apt-get autoremove'."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1083,45 +1047,45 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "De volgende informatie helpt u mogelijk verder:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Kon taak %s niet vinden"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kon pakket %s niet vinden"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1129,7 +1093,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:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1140,119 +1104,119 @@ 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:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Niet-werkende pakketten:"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Voorgestelde pakketten:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Aanbevolen pakketten:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Opwaardering wordt doorgerekend... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Klaar"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
 "worden"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kan geen bronpakket vinden voor %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Moet %sB aan bronarchieven ophalen.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Ophalen bron %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Ophalen van sommige archieven is mislukt."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Bouwopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Dochterproces is mislukt"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1261,7 +1225,7 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1270,32 +1234,33 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bouwvereisten voor %s konden niet voldaan worden."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1311,7 +1276,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1383,6 +1348,14 @@ msgstr ""
 "voor meer informatie en opties.\n"
 "                       Deze APT heeft Super Koekrachten.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Geraakt "
@@ -1619,9 +1592,9 @@ msgstr "Pakket-overeenkomst wordt overschreven met 'no version' voor %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kan %s niet lezen"
@@ -1856,7 +1829,7 @@ msgstr "Verbinding is verlopen"
 msgid "Server closed the connection"
 msgstr "Verbinding is verbroken door de server"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Leesfout"
 
@@ -1868,7 +1841,7 @@ msgstr "Een reactie deed de buffer overlopen"
 msgid "Protocol corruption"
 msgstr "Protocolcorruptie"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Schrijffout"
 
@@ -1922,7 +1895,7 @@ msgstr "Datasocket verbinding is verlopen"
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Probleem bij het hashen van het bestand"
 
@@ -2006,44 +1979,44 @@ msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Kan niet verbinden met %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Kon de sleutelring niet benaderen: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 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:205
+#: methods/gpgv.cc:223
 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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Er is tenminste één ongeldige ondertekening gevonden."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv "
 "geïnstalleerd?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Onbekende fout bij het uitvoeren van gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "De volgende ondertekeningen waren ongeldig:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2061,84 +2034,84 @@ msgstr "Kon geen pijp openen voor %s"
 msgid "Read error from %s process"
 msgstr "Leesfout door proces %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Wachtend op de kopteksten"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Foute koptekstregel"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Onbekend datumformaat"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Selectie is mislukt"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Verbinding verliep"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar het uitvoerbestand"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 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:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Wegschrijven van bestand %s is mislukt"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Interne fout"
 
@@ -2151,11 +2124,38 @@ msgstr "Kan een leeg bestand niet mmappen"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Kon van %lu bytes geen mmap maken"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selectie %s niet gevonden"
@@ -2170,44 +2170,44 @@ msgstr "Onbekende type-afkorting '%c'"
 msgid "Opening configuration file %s"
 msgstr "Configuratiebestand %s wordt geopend"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaxfout %s:%u: Blok start zonder naam."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaxfout %s:%u: Extra rommel na waarde"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven "
 "worden"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand"
@@ -2276,7 +2276,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Kan de status van het aanhechtpunt %s niet opvragen"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kan %s niet veranderen"
@@ -2313,143 +2313,153 @@ msgstr "Kon vergrendeling %s niet verkrijgen"
 msgid "Waited for %s but it wasn't there"
 msgstr "Er is gewacht op %s, maar die kwam niet"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Subproces %s ontving een segmentatiefout."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Subproces %s ontving een segmentatiefout."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Subproces %s gaf de foutcode %u terug"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Subproces %s sloot onverwacht af"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kon het bestand %s niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Probleem bij het afsluiten van het bestand"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Probleem bij het ontlinken van het bestand"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Probleem bij het synchroniseren van het bestand"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Lege pakketcache"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Het pakketcachebestand is beschadigd"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Het pakketcachebestand heeft een niet-compatibele versie"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "De pakketcache was aangemaakt voor een andere architectuur"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Vereisten"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Voor-Vereisten"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Suggesties"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Aanbevelingen"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Conflicteert met"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Vervangt"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Verouderd"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Breekt"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "belangrijk"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "noodzakelijk"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standaard"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "optioneel"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Boom van vereisten wordt opgebouwd"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Kandidaat-versies"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Generatie vereisten"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "De status informatie wordt gelezen"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Openen van StateFile %s is mislukt"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
@@ -2539,7 +2549,7 @@ msgstr ""
 "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor "
 "gevonden worden."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2547,11 +2557,11 @@ msgstr ""
 "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
 "veroorzaakt worden door vastgehouden pakketten."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2559,24 +2569,24 @@ msgstr ""
 "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
 "zijn oudere versies van gebruikt."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Lijstmap %spartial is afwezig."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Archiefmap %spartial is afwezig."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Bestand %li van %li wordt opgehaald"
@@ -2591,19 +2601,19 @@ msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
 msgid "Method %s did not start correctly"
 msgstr "Methode %s startte niet op de juiste manier"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
 "'enter' te drukken."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kan geen geschikt pakketsysteemtype bepalen"
 
@@ -2628,16 +2638,18 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ongeldige record in het voorkeurenbestand, geen 'Package'-koptekst"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Pintype %s wordt niet begrepen"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
 
@@ -2786,6 +2798,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Grootte komt niet overeen"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Kon pakketbestand %s niet ontleden (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Let op, %s wordt geselecteerd in plaats van %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2844,6 +2873,12 @@ msgstr ""
 "Er zijn %zu pakket-indexen, %zu bron-indexen, %zu vertalingsindexen, en %zu "
 "handtekeningen gevonden\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2874,22 +2909,22 @@ msgstr "Nieuwe bronlijst wordt weggeschreven\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i records weggeschreven.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i records weggeschreven met %i missende bestanden.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2901,12 +2936,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "%s is geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wordt geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "%s wordt verwijderd"
@@ -2916,63 +2951,84 @@ msgstr "%s wordt verwijderd"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Map '%s' is afwezig."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wordt uitgepakt"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Configuratie van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Fout bij het verwerken van triggers voor %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s is geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Verwijdering van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s is verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Volledige verwijdering van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s is volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet "
 "aangekoppeld?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kon de lijst-map niet vergrendelen"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kon bestand niet patchen"
@@ -2981,6 +3037,12 @@ msgstr "Kon bestand niet patchen"
 msgid "Connection closed prematurely"
 msgstr "Verbinding werd voortijdig afgebroken"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Fout bij het verwerken van triggers voor %s"
+
 #~ 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"
diff --git a/po/nn.po b/po/nn.po
index 27d718f09..9c8fe2f11 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -18,192 +18,151 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Finn ikkje pakken %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Tal p� pakkenamn: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Vanlege pakkar: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Reine virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Samansette virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Manglar: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Tal p� einskildversjonar: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Tal p� einskildversjonar: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Tal p� krav: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Tal p� ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Tal p� ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Tal p� tilbyr-forhold: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Tal p� strengar med jokerteikn: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Storleik p� kravs- og versjonsrom: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Slingringsmon: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Brukt plass i alt: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ute av takt."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Du m� oppgi n�yaktig eitt mnster"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Fann ingen pakkar"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(ikkje funne)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(ingen)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Pakke spikra til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert p� %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -691,79 +650,79 @@ msgstr "Problem ved oppheving av lenkje til %s"
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikkje endra namnet p� %s til %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-kompileringsfeil - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "F�lgjande pakkar har krav som ikkje er oppfylte:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "men l�t seg ikkje installera"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "men er ein virtuell pakke"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "men er ikkje installert"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "men skal ikkje installerast"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Dei f�lgjande NYE pakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Dei f�lgjande pakkane vil verta FJERNA:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Dei f�lgjande pakkane er haldne tilbake:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Dei f�lgjande pakkane vil verta oppgraderte:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Dei f�lgjande pakkane vil verta NEDGRADERTE:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Dei f�lgjande pakkane som er haldne tilbake vil verta endra:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (fordi %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -772,145 +731,145 @@ 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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nyleg installerte, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installerte p� nytt, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, 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:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Rettar p� krav ..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " mislukkast."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Klarte ikkje retta p� krav"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Klarte ikkje minimera oppgraderingsmengda"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Ferdig"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nokre krav er ikkje oppfylte. Pr�v med �-f�."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "�TVARING: Klarer ikkje autentisere desse pakkane."
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installer desse pakkane utan verifikasjon [j/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Nokre pakkar kunne ikkje bli autentisert"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje l�sa nedlastingskatalogen"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Kjeldelista kan ikkje lesast."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "M� henta %sB/%sB med arkiv.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "M� henta %sB med arkiv.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Ja, gjer som eg seier!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -921,28 +880,28 @@ msgstr ""
 "For � halda fram, m� du skriva n�yaktig �%s�.\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Avbryt."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du halda fram [J/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -950,49 +909,49 @@ msgstr ""
 "Klarte ikkje henta nokre av arkiva. Du kan pr�va med �apt-get update� eller �--"
 "fix-missing�."
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Klarte ikkje retta opp manglande pakkar."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Avbryt installasjon."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Merk, vel %s i staden for %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Installert]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Du m� velja ein som skal installerast."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1003,64 +962,69 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Dei f�lgjande pakkane kan brukast i staden:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Det finst ingen installasjonskandidat for pakken %s"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, 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:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Fann ikkje utg�va �%s� av �%s�"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Fann ikkje versjonen �%s� av �%s�"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Vald versjon %s (%s) for %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Klarte ikkje l�sa listekatalogen"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Dei f�lgjande NYE pakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1076,44 +1040,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "F�lgjande informasjon kan hjelpa med � l�ysa situasjonen:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Merk, vel %s i staden for regex �%s�\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1121,7 +1085,7 @@ msgstr ""
 "Nokre krav er ikkje oppfylte. Du kan pr�va �apt-get -f install� (eller velja "
 "ei l�ysing)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1133,123 +1097,123 @@ 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:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "�ydelagde pakkar"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Dei f�lgjande tilleggspakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "F�resl�tte pakkar:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Tilr�dde pakkar"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Mislukkast"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Ferdig"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, 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:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "M� henta %sB/%sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "M� henta %sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen �%s� mislukkast.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen �%s� mislukkast.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, 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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1258,31 +1222,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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "St�tta modular:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1299,7 +1263,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1366,6 +1330,14 @@ msgstr ""
 "til apt-get(8), sources.list(5) og apt.conf(5).\n"
 "                       APT har superku-krefter.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Treff "
@@ -1594,9 +1566,9 @@ msgstr "Skriv over pakketreff utan versjon for %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarte ikkje lesa %s"
@@ -1832,7 +1804,7 @@ msgstr "Tidsavbrot p� samband"
 msgid "Server closed the connection"
 msgstr "Tenaren lukka sambandet"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lesefeil"
 
@@ -1844,7 +1816,7 @@ msgstr "Eit svar flaumde over bufferen."
 msgid "Protocol corruption"
 msgstr "Protokoll�ydeleggjing"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Skrivefeil"
 
@@ -1898,7 +1870,7 @@ msgstr "Tidsavbrot p� tilkopling til datasokkel"
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av n�kkel for fil"
 
@@ -1982,39 +1954,39 @@ msgstr "Det hende noko dumt ved oppslag av �%s:%s� (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Klarte ikkje sl� opp �%s�"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei f�lgjande tilleggspakkane vil verta installerte:"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2030,81 +2002,81 @@ msgstr "Klarte ikkje opna r�yr for %s"
 msgid "Read error from %s process"
 msgstr "Lesefeil fr� %s-prosessen"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Ventar p� hovud"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fekk ei enkel hovudlinje over %u teikn"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "�ydelagd hovudlinje"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tenaren sende eit ugyldig �Content-Length�-hovud"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tenaren sende eit ugyldig �Content-Range�-hovud"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tenaren har �ydelagd st�tte for omr�de"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Tidsavbrot p� sambandet"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fr� tenaren. Sambandet vart lukka i andre enden"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Feil ved lesing fr� tenaren"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Klarte ikkje skriva fila %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "�ydelagde hovuddata"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -2117,11 +2089,38 @@ msgstr "Kan ikkje utf�ra mmap p� ei tom fil"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Klarte ikkje laga mmap av %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fann ikkje utvalet %s"
@@ -2136,42 +2135,42 @@ msgstr "Ukjend typeforkorting: �%c�"
 msgid "Opening configuration file %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksfeil %s:%u: Blokka startar utan namn."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaksfeil %s:%u: Misforma tagg"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det �vste niv�et"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaksfeil %s:%u: For mange n�sta inkluderte filer"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaksfeil %s:%u: Inkludert herifr�"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksfeil %s:%u: Direktivet �%s� er ikkje st�tta"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
@@ -2238,7 +2237,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Klarte ikkje f� status til monteringspunktet %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Klarte ikkje byta til %s"
@@ -2272,144 +2271,154 @@ msgstr "Klarte ikkje l�sa %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta p� %s, men den fanst ikkje"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Underprosessen %s mottok ein segmenteringsfeil."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s returnerte ein feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avslutta uventa"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lese, har framleis %lu att � lesa, men ingen att"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "skrive, har framleis %lu att � skrive, men klarte ikkje"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problem ved l�sing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problem ved oppheving av lenkje til fila"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problem ved synkronisering av fila"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Pakkelagerfila er �ydelagd"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT st�ttar ikkje versjonssystemet �%s�"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret er bygd for ein annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Krav"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Forkrav"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Forslag"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Tilr�dingar"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Konflikt"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Byter ut"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Foreldar"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "p�kravd"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "vanleg"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Byggjer kravtre"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Kandidatversjonar"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Genererer kravforhold"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 #, fuzzy
 msgid "Reading state information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Klarte ikkje opna %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Klarte ikkje skriva fila %s"
@@ -2497,7 +2506,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Pakken %s m� installerast p� nytt, men arkivet finst ikkje."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2505,12 +2514,12 @@ msgstr ""
 "Feil, �pkgProblemResolver::Resolve� har laga brot. Dette kan skuldast pakkar "
 "som er haldne tilbake."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Klarte ikkje retta opp problema. Nokre �ydelagde pakkar er haldne tilbake."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2518,24 +2527,24 @@ msgstr ""
 "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
 "filer er brukte i staden."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Arkivkatalogen %spartial manglar."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Les filliste"
@@ -2550,7 +2559,7 @@ msgstr "Finn ikkje metodedrivaren %s."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s starta ikkje rett"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
@@ -2558,12 +2567,12 @@ msgstr ""
 " �%s�\n"
 "i stasjonen �%s� og trykk Enter.\n"
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
 
@@ -2585,16 +2594,18 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Du vil kanskje pr�va � retta p� desse problema ved � k�yra �apt-get update�."
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Skj�nar ikkje spikringstypen %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) oppgitt for spiker"
 
@@ -2738,6 +2749,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Feil storleik"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Merk, vel %s i staden for %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2795,6 +2823,12 @@ msgid ""
 "zu signatures\n"
 msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
@@ -2825,22 +2859,22 @@ msgstr "Skriv ny kjeldeliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppf�ringar for denne disken er:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skreiv %i postar.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skreiv %i postar med %i manglande filer.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, 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"
@@ -2850,12 +2884,12 @@ msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
 msgid "Installing %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Koplar til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Opnar %s"
@@ -2865,61 +2899,82 @@ msgstr "Opnar %s"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "Feil ved lesing av katalogen %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Tilr�dingar"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Klarte ikkje l�sa listekatalogen"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
@@ -2929,6 +2984,13 @@ msgstr "Klarte ikkje opna fila %s"
 msgid "Connection closed prematurely"
 msgstr "Sambandet vart uventa stengd"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Feil ved lesing av katalogen %s"
+
 #~ 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"
diff --git a/po/pl.po b/po/pl.po
index 701c93c54..1942c9db0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-11-13 17:10+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -18,155 +18,150 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakiet %s w wersji %s ma niespełnione zależności:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nie udało się odnaleźć pakietu %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Liczba nazw pakietów: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Zwykłych pakietów: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Czysto wirtualnych pakietów: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Pojedynczych pakietów wirtualnych: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Mieszanych pakietów wirtualnych: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Brakujących: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "W sumie różnych wersji: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "W sumie różnych opisów: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "W sumie zależności: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "W sumie zależności wersja/plik: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "W sumie zależności opis/plik: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "W sumie mapowań zapewnień: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "W sumie dopasowanych napisów: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Sumaryczny rozmiar obszaru zależności od wersji: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Całkowity rozmiar: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Plik pakietu %s jest przestarzały."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Należy podać dokładnie jeden wzorzec"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Nie znaleziono żadnych pakietów"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Plików pakietów:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Przypięte pakiety:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(nieznaleziony)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Zainstalowana: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(brak)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandydująca: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Sposób przypięcia: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Tabela wersji:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s dla %s skompilowany %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -657,79 +652,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "T"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Błąd kompilacji wyrażenia regularnego - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Następujące pakiety mają niespełnione zależności:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "ale %s jest zainstalowany"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale %s ma zostać zainstalowany"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "ale nie da się go zainstalować"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "ale jest pakietem wirtualnym"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "ale nie jest zainstalowany"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "ale nie zostanie zainstalowany"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " lub"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Następujące pakiety zostaną USUNIĘTE:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Następujące pakiety zostały zatrzymane:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Następujące pakiety zostaną zaktualizowane:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (z powodu %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -737,145 +732,145 @@ 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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu przeinstalowywanych, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu cofniętych wersji, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, 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:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Naprawianie zależności..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " nie udało się."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Nie udało się naprawić zależności"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Nie udało się zminimalizować zbioru aktualizacji"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Gotowe"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Ostrzeżenie uwierzytelniania zignorowano.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Zainstalować te pakiety bez weryfikacji [t/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Błąd wewnętrzny, InstallPackages użyto z uszkodzonymi pakietami!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Błąd wewnętrzny, sortowanie niezakończone"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Nie udało się zablokować katalogu pobierania"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nie udało się odczytać list źródeł."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Dziwne. Rozmiary się nie zgadzają, proszę to zgłosić pod apt@packages.debian."
 "org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Konieczne pobranie %sB/%sB archiwów.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Konieczne pobranie %sB archiwów.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, 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:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Tak, rób jak mówię!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -886,28 +881,28 @@ msgstr ""
 "Aby kontynuować wpisz zdanie \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Przerwane."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Kontynuować [T/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nie udało się pobrać %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Nie udało się pobrać niektórych plików"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Ukończono pobieranie w trybie samego pobierania"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -915,48 +910,48 @@ msgstr ""
 "Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get "
 "update lub użyć opcji --fix-missing"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Nie udało się poprawić brakujących pakietów."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Przerywanie instalacji"
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Uwaga, wybieranie %s zamiast %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Zainstalowany]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Należy jednoznacznie wybrać jeden z nich do instalacji."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -967,54 +962,59 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Jednak następujące pakiety go zastępują:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Pakiet %s nie ma kandydata do instalacji"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s jest już w najnowszej wersji.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Wybrano wersję %s (%s) dla %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Polecenie update nie wymaga żadnych argumentów"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Nie udało się zablokować katalogu list"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1022,11 +1022,11 @@ msgstr ""
 "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
 "wymagane:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1044,43 +1044,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nie udało się odnaleźć zadania %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nie udało się odnaleźć pakietu %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1088,7 +1088,7 @@ msgstr ""
 "Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez "
 "pakietów (lub podać rozwiązanie)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1100,120 +1100,120 @@ msgstr ""
 "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n"
 "z katalogu Incoming (\"Przychodzące\")."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Pakiety są uszkodzone"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Sugerowane pakiety:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Polecane pakiety:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Obliczanie aktualizacji..."
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Nie udało się"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Gotowe"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, 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:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pomijanie już pobranego pliku \"%s\"\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Pobierz źródło %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Nie udało się pobrać niektórych archiwów."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Polecenie budowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Proces potomny zawiódł"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
 "zależności na czas budowania"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nie ma zależności czasu budowania.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1222,7 +1222,7 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
 "pakietu %s"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1231,32 +1231,33 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Nie udało się przetworzyć zależności na czas budowania"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Obsługiwane moduły:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1272,7 +1273,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1341,6 +1342,14 @@ msgstr ""
 "apt-get(8), sources.list(5) i apt.conf(5).\n"
 "                         Ten APT ma moce Super Krowy.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Traf "
@@ -1573,9 +1582,9 @@ msgstr "Dopasowanie dla %s nadpisującego pakietu bez wersji"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nie można czytać %s"
@@ -1811,7 +1820,7 @@ msgstr "Przekroczenie czasu połączenia"
 msgid "Server closed the connection"
 msgstr "Serwer zamknął połączenie"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Błąd odczytu"
 
@@ -1823,7 +1832,7 @@ msgstr "Odpowiedź przepełniła bufor."
 msgid "Protocol corruption"
 msgstr "Naruszenie zasad protokołu"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Błąd zapisu"
 
@@ -1877,7 +1886,7 @@ msgstr "Przekroczony czas połączenia gniazda danych"
 msgid "Unable to accept connection"
 msgstr "Nie udało się przyjąć połączenia"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Nie udało się obliczyć skrótu pliku"
 
@@ -1961,42 +1970,42 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Nie udało się połączyć z %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku "
 "klucza?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest "
 "zainstalowane?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Nieznany błąd podczas uruchamiania gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Następujące podpisy były błędne:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2014,80 +2023,80 @@ msgstr "Nie udało się otworzyć potoku dla %s"
 msgid "Read error from %s process"
 msgstr "Błąd odczytu z procesu %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Oczekiwanie na nagłówki"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Nieprawidłowa linia nagłówka"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Nieznany format daty"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Operacja select nie powiodła się"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Przekroczenie czasu połączenia"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Błąd przy pisaniu do pliku wyjściowego"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Błąd przy pisaniu do pliku"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Błąd przy pisaniu do pliku"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Błąd czytania z serwera"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Nie udało się uciąć zawartości pliku %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Błędne dane nagłówka"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Połączenie nie udało się"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
@@ -2100,11 +2109,38 @@ msgstr "Nie można wykonać mmap na pustym pliku"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Nie udało się wykonać mmap %lu bajtów"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Brak miejsca dla dynamicznego MMap"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Nie odnaleziono wyboru %s"
@@ -2119,43 +2155,43 @@ msgstr "Nierozpoznany skrót typu: \"%c\""
 msgid "Opening configuration file %s"
 msgstr "Otwieranie pliku konfiguracyjnego %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Błąd składniowy %s:%u: Błędny znacznik"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Błąd składniowy %s:%u: Dyrektywy mogą występować tylko na najwyższym poziomie"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Błąd składniowy %s:%u: Zbyt wiele zagnieżdżonych operacji include"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Błąd składniowy %s:%u: Włączony tutaj"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Błąd składniowy %s:%u: Śmieci na końcu pliku"
@@ -2222,7 +2258,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nie udało się przejść do %s"
@@ -2256,143 +2292,153 @@ msgstr "Nie udało się uzyskać blokady %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Oczekiwano na proces %s, ale nie było go"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s spowodował naruszenie segmentacji."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Podproces %s spowodował naruszenie segmentacji."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s zwrócił kod błędu (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s zakończył się niespodziewanie"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nie udało się otworzyć pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "należało zapisać jeszcze %lu, ale nie udało się to"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problem przy zamykaniu pliku"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problem przy usuwaniu pliku"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problem przy zapisywaniu pliku na dysk"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Pusty magazyn podręczny pakietów"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Magazyn podręczny pakietów jest uszkodzony"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Magazyn podręczny pakietów jest w niezgodnej wersji"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Wymaga"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "PreWymaga"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Sugeruje"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Poleca"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Jest w konflikcie z"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Zastępuje"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Czyni zbędnym"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Psuje"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "ważny"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "wymagany"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standardowy"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opcjonalny"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "dodatkowy"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Budowanie drzewa zależności"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Kandydujące wersje"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Generowanie zależności"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Odczyt informacji o stanie"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Nie udało się otworzyć pliku stanu %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
@@ -2481,7 +2527,7 @@ msgid ""
 msgstr ""
 "Pakiet %s ma zostać przeinstalowany, ale nie można znaleźć jego archiwum."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2489,11 +2535,11 @@ msgstr ""
 "Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane "
 "zatrzymanymi pakietami."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2501,24 +2547,24 @@ msgstr ""
 "Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub "
 "została użyta ich starsza wersja."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Brakuje katalogu list %spartial."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Brakuje katalogu archiwów %spartial."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Pobieranie pliku %li z %li (%s pozostało)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Pobieranie pliku %li z %li"
@@ -2533,17 +2579,17 @@ msgstr "Nie udało się odnaleźć sterownika metody %s."
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nie uruchomiła się poprawnie"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: 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"
 
@@ -2564,16 +2610,18 @@ msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Należy uruchomić apt-get update aby naprawić te problemy."
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Nieprawidłowe informacje w pliku ustawień, brak nagłówka Package"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nierozpoznany typ przypinania %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Brak (lub zerowy) priorytet przypięcia"
 
@@ -2719,6 +2767,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Błędny rozmiar"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Uwaga, wybieranie %s zamiast %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2777,6 +2842,12 @@ msgstr ""
 "Znaleziono %zu indeksów pakietów, %zu indeksów źródłowych, %zu indeksów "
 "tłumaczeń i %zu podpisów\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2807,22 +2878,22 @@ msgstr "Zapisywanie nowej listy źródeł\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Źródła dla tej płyty to:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapisano %i rekordów.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, 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"
@@ -2832,12 +2903,12 @@ msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n"
 msgid "Installing %s"
 msgstr "Instalowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Usuwanie %s"
@@ -2847,63 +2918,84 @@ msgstr "Usuwanie %s"
 msgid "Running post-installation trigger %s"
 msgstr "Uruchamianie wyzwalacza post-installation %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Brakuje katalogu \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Przygotowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozpakowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Przygotowanie do konfiguracji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Przetwarzanie wyzwalaczy dla %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Zainstalowany %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Przygotowanie do usunięcia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Usunięto %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Przygotowanie do całkowitego usunięcia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Całkowicie usunięto %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie "
 "zamontowane?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nie udało się zablokować katalogu list"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nie udało się nałożyć łatki na plik"
@@ -2912,6 +3004,15 @@ msgstr "Nie udało się nałożyć łatki na plik"
 msgid "Connection closed prematurely"
 msgstr "Połączenie zostało zamknięte przedwcześnie"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Przetwarzanie wyzwalaczy dla %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Brak miejsca dla dynamicznego MMap"
+
 #~ 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"
diff --git a/po/pt.po b/po/pt.po
index d96323935..b0a2bff99 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-09-09 20:54+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -15,154 +15,149 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "O pacote %s versão %s tem uma dependência não satisfeita:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Não foi possível encontrar o pacote %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Total de nomes de pacotes: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Pacotes normais: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Pacotes puramente virtuais: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Pacotes virtuais únicos: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Pacotes virtuais misturados: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Faltam: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Total de versões distintas: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Total de descrições distintas: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Total de dependências: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Total de relações ver/ficheiro: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Total de relações Desc/Ficheiro: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Total de Mapeamentos 'Provides': "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Total de strings globbed: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Espaço total de dependência de versão: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Espaço total desperdiçado: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Espaço total contabilizado: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro do pacote %s está dessincronizado."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Você deve dar exactamente um pattern"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Não foi encontrado nenhum pacote"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Ficheiros de Pacotes :"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Pacotes Marcados: "
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(não encontrado)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(nenhum)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Marcação do Pacote: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Tabela de Versão:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -653,79 +648,79 @@ msgstr "Problema ao executar unlinking %s"
 msgid "Failed to rename %s to %s"
 msgstr "Falhou renomear %s para %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "mas %s está instalado"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mas %s está para ser instalado"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "mas não é instalável"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "mas é um pacote virtual"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "mas não está instalado"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "mas não vai ser instalado"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Serão instalados os seguintes NOVOS pacotes:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Serão REMOVIDOS os seguintes pacotes:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Serão actualizados os seguintes pacotes:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Os seguintes pacotes mantidos serão mudados:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (devido a %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -733,145 +728,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu a que foi feito o downgrade, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, 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:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "A corrigir dependências..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " falhou."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Não foi possível corrigir dependências"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Não foi possível minimizar o conjunto de actualizações"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Feito"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependências não satisfeitas. Tente utilizar -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticação ultrapassado.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalar estes pacotes sem verificação [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes não puderam ser autenticados"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Há problemas e foi utilizado -y sem --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro Interno, Ordering não terminou"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Impossível criar acesso exclusivo ao directório de downloads"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pôde ser lida."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "É necessário obter %sB/%sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "É necessário obter %sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Após esta operação, serão utilizados %sB adicionais de espaço em disco.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Após esta operação, será libertado %sB de espaço em disco.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, 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:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only especificado mas isto não é uma operação trivial."
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Sim, faça como eu digo!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -882,28 +877,28 @@ msgstr ""
 "Para continuar escreva a frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Abortado."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Deseja continuar [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou obter %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Falhou o download de alguns ficheiros"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Download completo e em modo de fazer apenas o download"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -911,47 +906,47 @@ msgstr ""
 "Não foi possível obter alguns arquivos, tente talvez correr apt-get update "
 "ou tente com --fix-missing?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Não foi possível corrigir os pacotes em falta."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "A abortar a instalação."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Note, a seleccionar %s em vez de %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "O pacote %s não está instalado, por isso não será removido\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Instalado]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Você deve seleccionar explicitamente um para instalar."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -962,55 +957,60 @@ msgstr ""
 "Isso pode significar que o pacote falta, ou ficou obsoleto, ou\n"
 "está disponível somente a partir de outra fonte\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "No entanto, os seguintes pacotes substituem-no:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "O pacote %s não tem candidato para instalação"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s já está na versão mais recente.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Não foi encontrado o Release '%s' para '%s'"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Não foi encontrada a versão '%s' para '%s'"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versão seleccionada %s (%s) para %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Impossível criar acesso exclusivo ao directório de listas"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1018,11 +1018,11 @@ msgstr ""
 "Os seguintes pacotes foram instalados automaticamente e já não são "
 "necessários:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilize 'apt-get autoremove' para os remover."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1040,43 +1040,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover estragou coisas"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro Interno, AllUpgrade estragou algo"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Não foi possível encontrar a tarefa %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível encontrar o pacote %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s está definido para ser instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1084,7 +1084,7 @@ msgstr ""
 "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1096,119 +1096,119 @@ msgstr ""
 "distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
 "criados ou foram movidos do Incoming."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Pacotes estragados"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Os seguintes pacotes extra serão instalados:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualização... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Falhou"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Pronto"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro Interno, o solucionador de problemas estragou coisas"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Não foi possível encontrar um pacote de código fonte para %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "É necessário obter %sB de arquivos de código fonte.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter código fonte %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Falhou obter alguns arquivos."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "O comando de descompactação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "O comando de compilação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "O processo filho falhou"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Não foi possível obter informações de dependências de compilação para %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de compilação.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1217,7 @@ msgstr ""
 "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
 "pôde ser encontrado"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1226,33 @@ msgstr ""
 "a dependência de %s para %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:2503
+#: cmdline/apt-get.cc:2514
 #, 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: O pacote instalado %s é "
 "demasiado novo"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Falhou processar as dependências de compilação"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1267,7 +1268,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1337,6 +1338,14 @@ msgstr ""
 "sources.list(5) e apt.conf(5)\n"
 "                         Este APT tem Poderes de Super Vaca.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Hit "
@@ -1571,9 +1580,9 @@ msgstr "Substituir o pacote correspondente sem versão para %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "O ficheiro %s/%s substitui o que está no pacote %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Não foi possível ler %s"
@@ -1806,7 +1815,7 @@ msgstr "Foi atingido o tempo limite de ligação"
 msgid "Server closed the connection"
 msgstr "O servidor fechou a ligação"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Erro de leitura"
 
@@ -1818,7 +1827,7 @@ msgstr "Uma resposta sobrecarregou o buffer"
 msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Erro de escrita"
 
@@ -1872,7 +1881,7 @@ msgstr "Ligação de socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar ligação"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
@@ -1956,43 +1965,43 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Não foi possível ligar a %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Não foi possível aceder à 'keyring': '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 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:205
+#: methods/gpgv.cc:223
 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:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Pelo menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
 "instalado?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido ao executar gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2010,80 +2019,80 @@ msgstr "Não foi possível abrir pipe para %s"
 msgid "Read error from %s process"
 msgstr "Erro de leitura do processo %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "A aguardar por cabeçalhos"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Linha de cabeçalho errada"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte de range errado"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "A selecção falhou"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "O tempo da ligação expirou"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Erro ao escrever para o ficheiro de saída"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Erro ao escrever para ficheiro"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Erro ao escrever para o ficheiro"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Falhou truncar o ficheiro"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "A ligação falhou"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2096,11 +2105,38 @@ msgstr "Não é possível fazer mmap a um ficheiro vazio"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Não foi possível fazer mmap de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "'Dynamic MMap' ficou sem espaço"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "A selecção %s não foi encontrada"
@@ -2115,43 +2151,43 @@ msgstr "Abreviatura de tipo desconhecida: '%c'"
 msgid "Opening configuration file %s"
 msgstr "A abrir o ficheiro de configuração %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Erro de sintaxe %s:%u: Tag malformada"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro"
@@ -2218,7 +2254,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Impossível executar stat ao ponto de montagem %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossível mudar para %s"
@@ -2255,143 +2291,153 @@ msgstr "Não foi possível obter acesso exclusivo a %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperou por %s mas não estava lá"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "O sub-processo %s recebeu uma falha de segmentação."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "O sub-processo %s recebeu uma falha de segmentação."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "O sub-processo %s retornou um código de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O sub-processo %s terminou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Não foi possível abrir ficheiro o %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lido, ainda restam %lu para serem lidos mas não resta nenhum"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escrito, ainda restam %lu para escrever mas não foi possível"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problema ao fechar o ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problema ao remover o link ao ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o ficheiro"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazia"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "O ficheiro de cache de pacotes está corrompido"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 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:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Pré-Depende"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Em Conflito"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Estraga"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "necessário"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "padrão"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "A construir árvore de dependências"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Versões candidatas"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Geração de dependências"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "A ler a informação de estado"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Falhou abrir o StateFile %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Falha escrever ficheiro temporário StateFile %s"
@@ -2481,7 +2527,7 @@ msgstr ""
 "O pacote %s necessita ser reinstalado, mas não foi possível encontrar um "
 "repositório para o mesmo."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2489,13 +2535,13 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
 "pacotes mantidos (hold)."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) "
 "estragados."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2503,24 +2549,24 @@ msgstr ""
 "Falhou o download de alguns ficheiros de índice, foram ignorados ou os "
 "antigos foram usados em seu lugar."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Falta directório de listas %spartial."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Falta o directório de repositório %spartial."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "A obter o ficheiro %li de %li (%s restantes)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "A obter o ficheiro %li de %li"
@@ -2535,18 +2581,18 @@ msgstr "O driver do método %s não pôde ser encontrado."
 msgid "Method %s did not start correctly"
 msgstr "Método %s não iniciou corretamente"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: 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 adequado"
@@ -2570,16 +2616,18 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Você terá que executar apt-get update para corrigir estes problemas"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Package"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Não foi possível entender o tipo de marca (pin) %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)"
 
@@ -2732,6 +2780,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Tamanho incorrecto"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Note, a seleccionar %s em vez de %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2790,6 +2855,12 @@ msgstr ""
 "Foram encontrados %zu índices de pacotes, %zu índices de código-fonte, %zu "
 "índices de tradução e %zu assinaturas\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2820,22 +2891,22 @@ msgstr "A escrever lista de novas source\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas de listas de Source para este Disco são:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Escreveu %i registos.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2847,12 +2918,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "A instalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "A configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "A remover %s"
@@ -2862,63 +2933,84 @@ msgstr "A remover %s"
 msgid "Running post-installation trigger %s"
 msgstr "A correr o 'trigger' de pós-instalação %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directório '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempacotar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "A processar chamadas para %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "A preparar a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "A preparar para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Remoção completa de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está "
 "montado?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Impossível criar acesso exclusivo ao directório de listas"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Não foi possível aplicar o 'patch' ao ficheiro"
@@ -2927,6 +3019,15 @@ msgstr "Não foi possível aplicar o 'patch' ao ficheiro"
 msgid "Connection closed prematurely"
 msgstr "Ligação encerrada prematuramente"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "A processar chamadas para %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "'Dynamic MMap' ficou sem espaço"
+
 #~ 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"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 44266dc27..de34c9d81 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -16,155 +16,150 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "O pacote %s versão %s tem uma dependência desencontrada:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossível encontrar o pacote %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Total de Nomes de Pacotes: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Pacotes normais: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Pacotes puramente virtuais: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Pacotes virtuais únicos: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Pacotes virtuais misturados: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Faltando: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Total de versões distintas: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Total de descrições distintas: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Total de dependências: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Total de relações ver/arquivo: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Total de relações Desc/Arquivo: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Total de mapeamentos \"Provides\": "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Total de strings \"globbed\": "
 
-#: cmdline/apt-cache.cc:330
+#: 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:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Total de espaço frouxo: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Total de espaço contabilizado para: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O arquivo de pacote %s está fora de sincronia."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Você deve passar exatamente um padrão"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Nenhum pacote encontrado"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Arquivos de pacote:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "O cache está fora de sincronia, não foi possível fazer a referência cruzada "
 "de um arquivo de pacote"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Pacotes alfinetados (\"pinned\"):"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(não encontrado)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(nenhum)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Pacote alfinetado (\"pin\"): "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Tabela de versão:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -658,79 +653,79 @@ msgstr "Problema removendo %s"
 msgid "Failed to rename %s to %s"
 msgstr "Falhou ao renomear %s para %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Os pacotes a seguir têm dependências desencontradas:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "mas %s está instalado"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mas %s está para ser instalado"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "mas não é instalável"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "mas é um pacote virtual"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "mas não está instalado"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "mas não será instalado"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Os NOVOS pacotes a seguir serão instalados:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Os pacotes a seguir serão REMOVIDOS:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 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:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Os pacotes a seguir serão atualizados:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Os pacotes a seguir serão REVERTIDOS:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Os seguintes pacotes mantidos serão mudados:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por causa de %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -739,146 +734,146 @@ msgstr ""
 "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
 "fazendo!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu revertidos, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, 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:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Corrigindo dependências..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " falhou."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Impossível corrigir dependências"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Impossível minimizar o conjunto de atualizações"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Pronto"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependências desencontradas. Tente usar -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticação sobreposto.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalar estes pacotes sem verificação [s/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes não puderam ser autenticados"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, Ordenação não finalizou"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Impossível criar trava no diretório de download"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pode ser lida."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Que estranho.. Os tamanhos não batem, mande e-mail para apt@packages.debian."
 "org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "É preciso baixar %sB/%sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "É preciso baixar %sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Depois desta operação, %sB adicionais de espaço em disco serão usados.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, 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:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "\"Trivial Only\" especificado mas esta não é uma operação trivial."
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Sim, faça o que eu digo!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -889,28 +884,28 @@ msgstr ""
 "Para continuar digite a frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Abortar."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Você quer continuar [S/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou ao buscar %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Alguns arquivos falharam ao baixar"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Baixar completo e no modo somente baixar (\"download only\")"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -918,47 +913,47 @@ msgstr ""
 "Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar "
 "com --fix-missing?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Impossível corrigir pacotes faltantes."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Abortando instalação."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Nota, selecionando %s ao invés de %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "O pacote %s é um pacote virtual fornecido por:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Instalado]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Você deveria selecionar explicitamente um para instalar."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -969,53 +964,58 @@ msgstr ""
 "Isto 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "No entanto, os pacotes a seguir o substituem:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "O pacote %s não tem candidato para instalação"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s já é a versão mais nova.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' para '%s' não foi encontrada"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versão '%s' para '%s' não foi encontrada"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versão selecionada %s (%s) para %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Impossível criar trava no diretório de listas"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1023,11 +1023,11 @@ msgstr ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' para removê-los."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1045,43 +1045,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover quebrou coisas"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade quebrou coisas"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Impossível achar tarefa %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível achar pacote %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, selecionando %s para expressão regular '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1089,7 +1089,7 @@ msgstr ""
 "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1101,117 +1101,117 @@ msgstr ""
 "distribuição instável, que alguns pacotes requeridos não foram\n"
 "criados ainda ou foram retirados da \"Incoming\"."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Os pacotes extra a seguir serão instalados:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Calculando atualização... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Falhou"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Pronto"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o solucionador de problemas quebrou coisas"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossível encontrar um pacote fonte para %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pulando arquivo já baixado '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Preciso obter %sB de arquivos fonte.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Falhou ao buscar alguns arquivos."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando de desempacotamento '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando de construção '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Processo filho falhou"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de construção.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1220,7 +1220,7 @@ msgstr ""
 "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
 "pode ser encontrado"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1229,32 +1229,33 @@ 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 requerimentos de versão"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
 "novo"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Falhou ao processar as dependências de construção"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1270,7 +1271,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1339,6 +1340,14 @@ msgstr ""
 "para mais informações e opções.\n"
 "                       Este APT tem Poderes de Super Vaca.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Atingido "
@@ -1574,9 +1583,9 @@ msgstr "Sobrescrita de pacote não combina com nenhuma versão para %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossível ler %s"
@@ -1809,7 +1818,7 @@ msgstr "Conexão expirou"
 msgid "Server closed the connection"
 msgstr "Servidor fechou a conexão"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Erro de leitura"
 
@@ -1821,7 +1830,7 @@ msgstr "Uma resposta sobrecarregou o buffer"
 msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Erro de escrita"
 
@@ -1875,7 +1884,7 @@ msgstr "Conexão do socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar conexão"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema criando o hash do arquivo"
 
@@ -1959,43 +1968,43 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Impossível conectar em %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Não foi possível acessar o chaveiro: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Assinatura boa, mas não foi possível determinar a impressão "
 "digital da chave?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Ao menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
 "instalado?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido executando gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2013,80 +2022,80 @@ msgstr "Não foi possível abrir \"pipe\" para %s"
 msgid "Read error from %s process"
 msgstr "Erro de leitura do processo %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Aguardando por cabeçalhos"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Linha de cabeçalho ruim"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Seleção falhou"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Conexão expirou"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Erro escrevendo para arquivo de saída"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Erro escrevendo para arquivo"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Erro escrevendo para o arquivo"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Falhou ao truncar arquivo"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Dados de cabeçalho ruins"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2099,11 +2108,38 @@ msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "\"MMap\" Dinâmico ficou sem espaço"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Seleção %s não encontrada"
@@ -2118,43 +2154,43 @@ msgstr "Abreviação de tipo desconhecida: '%c'"
 msgid "Opening configuration file %s"
 msgstr "Abrindo arquivo de configuração %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Erro de sintaxe %s:%u: Tag mal formada"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Erro de sintaxe %s:%u: Muitos \"includes\" aninhados"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Erro de sintaxe %s:%u: Não há suporte para a diretiva '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo"
@@ -2222,7 +2258,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Impossível executar \"stat\" no ponto de montagem %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossível mudar para %s"
@@ -2256,143 +2292,153 @@ msgstr "Não foi possível obter trava %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperado %s mas este não estava lá"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Sub-processo %s recebeu uma falha de segmentação."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Sub-processo %s recebeu uma falha de segmentação."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Sub-processo %s retornou um código de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Sub-processo %s finalizou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Não foi possível abrir arquivo %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problema fechando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problema removendo o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o arquivo"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazio"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "O arquivo de cache de pacotes está corrompido"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 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:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Pré-Depende"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Conflita"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Quebra"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "requerido"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "padrão"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Construindo árvore de dependências"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Versões candidatas"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Geração de dependência"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Lendo informação de estado"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
@@ -2483,7 +2529,7 @@ msgstr ""
 "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
 "arquivo para o mesmo."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2491,11 +2537,11 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
 "pacotes mantidos (hold)."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2503,24 +2549,24 @@ msgstr ""
 "Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os "
 "antigos foram usados no lugar."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Diretório de listas %spartial está faltando."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Diretório de arquivos %spartial está faltando."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Obtendo o arquivo %li de %li (%s restantes)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Obtendo arquivo %li de %li"
@@ -2535,18 +2581,18 @@ msgstr "O driver do método %s não pode ser encontrado."
 msgid "Method %s did not start correctly"
 msgstr "Método %s não iniciou corretamente"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável."
 
@@ -2569,16 +2615,18 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Você terá que executar apt-get update para corrigir estes problemas"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Não foi possível entender o tipo de \"pin\" %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\""
 
@@ -2729,6 +2777,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Tamanho incorreto"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Nota, selecionando %s ao invés de %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2787,6 +2852,12 @@ msgstr ""
 "Encontrado(s) %zu índice(s) de pacote(s), %zu índice(s) de fonte(s), %zu "
 "índice(s) de traduções e %zu assinatura(s)\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2817,22 +2888,22 @@ msgstr "Gravando nova lista de fontes\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Entradas na lista de fontes para este disco são:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Gravados %i registros.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Gravados %i registros com %i arquivos faltando.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2844,12 +2915,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Removendo %s"
@@ -2859,61 +2930,82 @@ msgstr "Removendo %s"
 msgid "Running post-installation trigger %s"
 msgstr "Executando gatilho pós-instalação %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Diretório '%s' está faltando"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempacotando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparando para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Erro processando gatilhos para %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparando para a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparando para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Impossível criar trava no diretório de listas"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Não foi possível aplicar o patch"
@@ -2922,6 +3014,15 @@ msgstr "Não foi possível aplicar o patch"
 msgid "Connection closed prematurely"
 msgstr "Conexão encerrada prematuramente"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Erro processando gatilhos para %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "\"MMap\" Dinâmico ficou sem espaço"
+
 #~ 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"
diff --git a/po/ro.po b/po/ro.po
index a60e85ecf..3010dd293 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-11-15 02:21+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -18,154 +18,149 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nu s-a putut localiza pachetul %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Total nume pachete : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Pachete normale: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Pachete virtuale pure: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Pachete virtuale singulare: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Pachete virtuale mixte: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Lipsă: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Total versiuni distincte: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Numărul total de descrieri distincte: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Total dependențe: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Total relații versiune/fișier: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Total relații desc/fișier: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Total cartări Furnizează: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Total șiruri înglobate: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Total spațiu versiuni ale dependențelor: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Total spațiu intern: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Total spațiu contorizat pentru: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Fișierul pachetului %s este desincronizat."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Trebuie să dați exact un șablon"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Nu s-au găsit pachete"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Fișiere pachet: "
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Cache-ul este desincronizat, nu se poate executa x-ref pe un fișier pachet"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Pachete alese special:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(negăsit)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Instalat: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(niciunul)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Candidează: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Pachet ales special: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Tabela de versiuni:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "        %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pentru %s compilat la %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -660,79 +655,79 @@ msgstr "Problemă la desfacerea %s"
 msgid "Failed to rename %s to %s"
 msgstr "Eșec la redenumirea lui %s în %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Eroare de compilare expresie regulată - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Următoarele pachete au dependențe neîndeplinite:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "dar %s este instalat"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "dar %s este pe cale de a fi instalat"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "dar nu este instalabil"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "dar este un pachet virtual"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "dar nu este instalat"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "dar nu este pe cale să fie instalat"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " sau"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Următoarele pachete NOI vor fi instalate:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Următoarele pachete vor fi ȘTERSE:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Următoarele pachete au fost reținute:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Următoarele pachete vor fi ÎNNOITE:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Următoarele pachete vor fi DE-GRADATE:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Următoarele pachete ținute vor fi schimbate:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (datorită %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -740,145 +735,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu înnoite, %lu nou instalate, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalate, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu de-gradate, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu de șters și %lu neînnoite.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu instalate sau șterse incomplet.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Corectez dependențele..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " eșec."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Nu s-au putut corecta dependențele"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Terminat"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Avertisment de autentificare înlocuit.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalați aceste pachete fără verificare [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Unele pachete n-au putut fi autentificate"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Eroare internă, Ordering nu s-a terminat"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Nu s-a putut bloca directorul de descărcare"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Lista surselor nu poate fi citită."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, 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:842
+#: cmdline/apt-get.cc:845
 #, 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:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "După această operație vor fi folosiți din disc încă %sB.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "N-am putut determina spațiul disponibil în %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Da, fă cum îți spun!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -889,28 +884,28 @@ msgstr ""
 "Pentru a continua tastați fraza '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Renunțare."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vreți să continuați [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Eșec la aducerea lui %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Descărcarea unor fișiere a eșuat"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Descărcare completă și în modul doar descărcare"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -918,47 +913,47 @@ msgstr ""
 "Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get "
 "update' sau încercați cu --fix-missing?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Nu pot corecta pachetele lipsă."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Abandonez instalarea."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Notă, se selectează %s în locul lui %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Instalat]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Ar trebui să alegeți în mod explicit unul pentru instalare."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -969,64 +964,69 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Oricum următoarele pachete îl înlocuiesc:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Pachetul %s nu are nici un candidat la instalare"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s este deja la cea mai nouă versiune.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' pentru '%s' n-a fost găsită"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versiune selectată %s (%s) pentru %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Comanda de actualizare nu are argumente"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Nu pot încuia directorul cu lista"
 
 # XXX: orice sugestie este bine-venită
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Folosiți 'apt-get autoremove' pentru a le șterge."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1045,43 +1045,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nu s-a putut găsi sarcina %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nu pot găsi pachetul %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1089,7 +1089,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:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1102,118 +1102,118 @@ msgstr ""
 "pachete\n"
 "cerute n-au fost create încă sau au fost mutate din Incoming."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Următoarele extra pachete vor fi instalate:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Pachete sugerate:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Pachete recomandate:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Calculez înnoirea... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Eșec"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Terminat"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Sar peste fișierul deja descărcat '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, 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:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Aducere sursa %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Eșec la aducerea unor arhive."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comanda de despachetare '%s' eșuată.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comanda de construire '%s' eșuată.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Procesul copil a eșuat"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nu are dependențe înglobate.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1222,7 +1222,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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1231,32 +1231,33 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
 "prea nou"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Eșec la prelucrarea dependențelor de compilare"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1272,7 +1273,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1342,6 +1343,14 @@ msgstr ""
 "pentru mai multe informații și opțiuni.\n"
 "                       Acest APT are puterile unei Super Vaci.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Atins "
@@ -1577,9 +1586,9 @@ msgstr "Pachet suprascris fără nici o versiune pentru %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nu s-a putut citi %s"
@@ -1816,7 +1825,7 @@ msgstr "Timpul de conectare a expirat"
 msgid "Server closed the connection"
 msgstr "Serverul a închis conexiunea"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Eroare de citire"
 
@@ -1828,7 +1837,7 @@ msgstr "Un răspuns a depășit zona de tampon."
 msgid "Protocol corruption"
 msgstr "Protocol corupt"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Eroare de scriere"
 
@@ -1884,7 +1893,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat"
 msgid "Unable to accept connection"
 msgstr "Nu s-a putut accepta conexiune"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problemă la calcularea dispersiei pentru fișierul"
 
@@ -1969,42 +1978,42 @@ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Nu s-a putut accesa inelul de chei: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina "
 "amprenta digitale a cheii?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Eroare necunoscută în timp ce se execută gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Următoarele semnături nu au fost valide:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2022,81 +2031,81 @@ msgstr "Nu s-a putut deschide conexiunea pentru %s"
 msgid "Read error from %s process"
 msgstr "Eroare de citire din procesul %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "În așteptarea antetelor"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "S-a primit o singură linie de antet de peste %u caractere"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Linie de antet necorespunzătoare"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Acest server HTTP are un suport defect de intervale"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Format dată necunoscut"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Selecția a eșuat"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Timp de conectare expirat"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fișierului de rezultat"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Eroare la scrierea în fișier"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Eroare la scrierea în fișierul"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Eroare la citirea de la server"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Eșec la trunchierea fișierului"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Conectare eșuată"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Eroare internă"
 
@@ -2109,11 +2118,38 @@ msgstr "Nu s-a putut executa „mmap” cu un fișier gol"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Nu s-a putut face mmap cu %lu octeți"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "MMap-ul dinamic a rămas fără spațiu"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selecția %s nu a fost găsită"
@@ -2128,43 +2164,43 @@ msgstr "Abreviere de tip nerecunoscut: „%c”"
 msgid "Opening configuration file %s"
 msgstr "Se deschide fișierul de configurare %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume"
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Eroare de sintaxă %s:%u: etichetă greșită"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Eroare de sintaxă %s:%u: incluse de aici"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 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"
@@ -2232,7 +2268,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Nu pot determina starea punctului de montare %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nu pot schimba la %s"
@@ -2266,143 +2302,153 @@ msgstr "Nu pot determina blocajul %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Așteptat %s, dar n-a fost acolo"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Subprocesul %s a primit o eroare de segmentare."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Subprocesul %s a primit o eroare de segmentare."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Subprocesul %s a întors un cod de eroare (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Subprocesul %s s-a terminat brusc"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nu s-a putut deschide fișierul %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "scriere, încă mai am %lu de scris dar nu pot"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problemă la închiderea fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problemă la dezlegarea fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problemă în timpul sincronizării fișierului"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Cache gol de pachet"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Cache-ul fișierului pachet este deteriorat"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Fișierul cache al pachetului este o versiune incompatibilă"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Acest APT nu suportă versioning system '%s'"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Depinde"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Pre-depinde"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Sugerează"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Recomandă"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Este în conflict"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Înlocuiește"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Învechit"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Corupe"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "cerut"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "opțional"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Se construiește arborele de dependență"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Versiuni candidat"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Generare dependențe"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Se citesc informațiile de stare"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Eșec la deschiderea fișierului de stare %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Eșec la scrierea fișierului temporar de stare %s"
@@ -2491,7 +2537,7 @@ msgid ""
 msgstr ""
 "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2499,11 +2545,11 @@ msgstr ""
 "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
 "cauzată de pachete ținute."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2511,24 +2557,24 @@ msgstr ""
 "Descărcarea unor fișiere index a eșuat, acestea fie au fost ignorate, fie au "
 "fost folosite în loc unele vechi."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Directorul de liste %spartial lipsește."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Directorul de arhive %spartial lipsește."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Se descarcă fișierul %li din %li (%s rămas)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Se descarcă fișierul %li din %li"
@@ -2543,18 +2589,18 @@ msgstr "Metoda driver %s nu poate fi găsită."
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nu s-a lansat corect"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit"
 
@@ -2578,16 +2624,18 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme."
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nu s-a înțeles tipul de pin %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Fără prioritate (sau zero) specificată pentru pin"
 
@@ -2739,6 +2787,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Nepotrivire dimensiune"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Notă, se selectează %s în locul lui %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2798,6 +2863,12 @@ msgstr ""
 "Au fost găsite %zu indexuri de pachete, %zu indexuri de surse, %zu indexuri "
 "de traduceri și %zu semnături\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2828,22 +2899,22 @@ msgstr "Scriere noua listă sursă\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Intrările listei surselor pentru acest disc sunt:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S-au scris %i înregistrări.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2854,12 +2925,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Se instalează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Se configurează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Se șterge %s"
@@ -2869,62 +2940,83 @@ msgstr "Se șterge %s"
 msgid "Running post-installation trigger %s"
 msgstr "Se rulează declanșatorul post-instalare %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directorul „%s” lipsește."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Se pregătește %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Se despachetează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Se pregătește configurarea %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Se procesează declanșatorii pentru %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Instalat %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Se pregătește ștergerea lui %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Șters %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Se pregătește ștergerea completă a %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Șters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nu pot încuia directorul cu lista"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nu s-a putut peteci fișierul"
@@ -2933,6 +3025,15 @@ msgstr "Nu s-a putut peteci fișierul"
 msgid "Connection closed prematurely"
 msgstr "Conexiune închisă prematur"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Se procesează declanșatorii pentru %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "MMap-ul dinamic a rămas fără spațiu"
+
 #~ 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"
diff --git a/po/ru.po b/po/ru.po
index f14cc5b62..b3e4bb13f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,13 +8,14 @@
 # Dmitry Astapov <adept@umc.com.ua>, 2004.
 # Dmitry Astapov <adept@despammed.com>, 2004.
 # Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006, 2007, 2008.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.7.19\n"
+"Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-16 21:10+0300\n"
-"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-05-03 22:01+0400\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,153 +25,148 @@ msgstr ""
 "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:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Не удалось найти пакет %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Всего имён пакетов : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Обычных пакетов: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Полностью виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Одиночных виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Смешанных виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Отсутствует: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Всего уникальных версий: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Всего уникальных описаний: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Всего зависимостей: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Всего отношений Версия/Файл: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Всего отношений Описание/Файл: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Всего отношений Provides: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Всего развёрнутых строк: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Всего информации о зависимостях: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
-msgstr "Пустого места в кеше: "
+msgstr "Пустого места в кэше: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Полное учтённое пространство: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Список пакетов %s рассинхронизирован."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Вы должны задать только один шаблон"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Не найдено ни одного пакета"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Списки пакетов:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Кеш рассинхронизирован, невозможно обнаружить ссылку на список пакетов"
-
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
+msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Зафиксированные пакеты:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(не найдено)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Установлен: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(отсутствует)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Фиксатор пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Таблица версий:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s для %s скомпилирован %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -214,10 +210,10 @@ msgstr ""
 "          или: apt-cache [параметры] showsrc пакет1 [пакет2 ...]\n"
 "\n"
 "apt-cache -- низкоуровневый инструмент, используемый для управления\n"
-"двоичными кеш-файлами APT и поиску по ним\n"
+"двоичными кэш-файлами APT и поиску по ним\n"
 "Команды:\n"
-"   add - добавить файл пакета в кеш исходников\n"
-"   gencaches - построить оба кеша пакетов - двоичных и с исходным кодом\n"
+"   add - добавить файл пакета в кэш источников\n"
+"   gencaches - построить кэш пакетов и кэш источников\n"
 "   showpkg - показать общую информацию о конкретном пакете\n"
 "   stats - показать общую статистику\n"
 "   dump - показать весь файл в сокращённой форме\n"
@@ -234,13 +230,12 @@ msgstr ""
 "\n"
 "Параметры:\n"
 "  -h   Этот текст.\n"
-"  -p=? Кеш пакетов.\n"
-"  -s=? Кеш пакетов исходного кода.\n"
+"  -p=? Кэш пакетов.\n"
+"  -s=? Кэш источников.\n"
 "  -q   Не показывать индикатор прогресса.\n"
 "  -i   Показывать только важные зависимости для команды unmet.\n"
 "  -c=? Читать указанный файл настройки.\n"
-"  -o=? Задать произвольный параметра настройки, например, -o dir::cache=/"
-"tmp\n"
+"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
 "Подробности в справочных страницах apt-cache(8) и apt.conf(5).\n"
 
 #: cmdline/apt-cdrom.cc:78
@@ -274,18 +269,19 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Использование: apt-config [options] command\n"
+"Использование: apt-config [параметры] команда\n"
 "\n"
-"apt-config - простой инструмент для чтения конфигурационного файла APT\n"
+"apt-config -- простой инструмент для чтения файла настройки APT\n"
 "\n"
 "Команды:\n"
 "   shell - режим shell\n"
-"   dump - показать конфигурацию\n"
+"   dump -  показать настройки\n"
 "\n"
-"Опции:\n"
+"Параметры:\n"
 "   -h   Этот текст.\n"
-"   -с=? Читать указанный конфигурационный файл.\n"
-"   -o=? Установить произвольную опцию, к примеру, -o dir::cache=/tmp\n"
+"   -с=? Читать указанный файл настройки.\n"
+"   -o=? Задать значение произвольной настройке, например, -o dir::cache=/"
+"tmp\n"
 
 #: cmdline/apt-extracttemplates.cc:98
 #, c-format
@@ -305,16 +301,15 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Использование: apt-extracttemplates file1 [file2 ...]\n"
+"Использование: apt-extracttemplates файл1 [файл2 ...]\n"
 "\n"
-"apt-extracttemplates извлекает из пакетов Debian конфигурационные скрипты\n"
-"и файлы-шаблоны\n"
+"apt-extracttemplates извлекает из пакетов Debian данные config и template\n"
 "\n"
-"Опции:\n"
+"Параметры:\n"
 "  -h   Этот текст\n"
-"  -t   Установить каталог для временных файлов\n"
-"  -c=? Читать указанный конфигурационный файл\n"
-"  -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n"
+"  -t   Задать каталог для временных файлов\n"
+"  -c=? Читать указанный файл настройки\n"
+"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
 
 #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
 #, c-format
@@ -338,9 +333,7 @@ msgstr "Ошибка обработки каталога %s"
 
 #: ftparchive/apt-ftparchive.cc:251
 msgid "Source extension list is too long"
-msgstr ""
-"Список расширений, допустимых для пакетов с исходными текстами, слишком "
-"длинен"
+msgstr "Список расширений источников слишком длинен"
 
 #: ftparchive/apt-ftparchive.cc:368
 msgid "Error writing header to contents file"
@@ -429,15 +422,14 @@ msgstr ""
 "Параметры:\n"
 "  -h    Этот текст\n"
 "  --md5 Управление генерацией MD5-хешей\n"
-"  -s=?  Указать файл переназначений (override) для пакетов с исходными "
-"текстами\n"
+"  -s=?  Указать файл переназначений (override) для источников\n"
 "  -q    Не выводить сообщения в процессе работы\n"
-"  -d=?  Указать кеширующую базу данных (не обязательно)\n"
+"  -d=?  Указать кэширующую базу данных (не обязательно)\n"
 "  --no-delink Включить режим отладки процесса удаления файлов\n"
 "  --contents  Управление генерацией полного перечня содержимого пакетов\n"
 "              (файла Contents)\n"
-"  -c=?  Использовать указанный конфигурационный файл\n"
-"  -o=?  Указать произвольный параметр конфигурации"
+"  -c=?  Использовать указанный файл настройки\n"
+"  -o=?  Задать значение произвольному параметру настройки"
 
 #: ftparchive/apt-ftparchive.cc:759
 msgid "No selections matched"
@@ -666,80 +658,80 @@ msgstr "Не удалось удалить %s"
 msgid "Failed to rename %s to %s"
 msgstr "Не удалось переименовать %s в %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "д"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Ошибка компиляции регулярного выражения - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "но %s уже установлен"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "но %s будет установлен"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "но он не может быть установлен"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "но это виртуальный пакет"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "но он не установлен"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "но он не будет установлен"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " или"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "НОВЫЕ пакеты, которые будут установлены:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Пакеты, которые будут УДАЛЕНЫ:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Пакеты, которые будут оставлены в неизменном виде:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Пакеты, которые будут обновлены:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr ""
 "Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (вследствие %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -747,153 +739,153 @@ msgstr ""
 "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
 "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "обновлено %lu, установлено %lu новых пакетов, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "переустановлено %lu переустановлено, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu пакетов заменены на старые версии, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "не установлено до конца или удалено %lu пакетов.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Исправление зависимостей..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " не удалось."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Невозможно скорректировать зависимости"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Невозможно минимизировать набор обновлений"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Готово"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
 "f install'."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Предупреждение об аутентификации не принято в внимание.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Установить эти пакеты без проверки [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Некоторые пакеты невозможно аутентифицировать"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
-msgstr "Существуют проблемы, а опция -y использована без --force-yes"
+msgstr "Существуют проблемы, а параметр -y указан без --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Внутренняя ошибка, InstallPackages была вызвана с неработоспособными "
 "пакетами!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Пакеты необходимо удалить, но удаление запрещено."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутренняя ошибка, Ordering не завершилась"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
-msgstr "Невозможно заблокировать каталог для загрузки"
+msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Не читается перечень источников."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Необходимо скачать %sB/%sB архивов.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Необходимо скачать %sБ архивов.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "После данной операции, объём занятого дискового пространства возрастёт на %"
 "sB.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "После данной операции, объём занятого дискового пространства уменьшится на %"
 "sB.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не удалось определить количество свободного места в %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Недостаточно свободного места в %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Запрошено выполнение только тривиальных операций, но это не тривиальная "
 "операция."
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Да, делать, как я скажу!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -904,77 +896,76 @@ msgstr ""
 "Чтобы продолжить, введите фразу: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Аварийное завершение."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Хотите продолжить [Д/н]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr "Не удалось загрузить %s  %s\n"
+msgstr "Не удалось получить %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
-msgstr "Некоторые файлы не удалось загрузить"
+msgstr "Некоторые файлы скачать не удалось"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
-msgstr "Указан режим \"только загрузка\", и загрузка завершена"
+msgstr "Указан режим \"только скачивание\", и скачивание завершено"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get "
-"update или попытаться повторить запуск с ключом --fix-missing"
+"Невозможно получить некоторые архивы, вероятно надо запустить apt-get update "
+"или попытаться повторить запуск с ключом --fix-missing"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Невозможно исправить ситуацию с пропущенными пакетами."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Аварийное завершение установки."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Заметьте, вместо %2$s выбирается %1$s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
+msgstr "Пропускается %s - пакет уже установлен и нет команды upgrade.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Пакет %s не установлен, поэтому не может быть удалён\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Установлен]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Вы должны явно указать, какой именно вы хотите установить."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -985,63 +976,68 @@ msgstr ""
 "Это может означать, что пакет отсутствует, устарел, или доступен из "
 "источников, не упомянутых в sources.list\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Однако следующие пакеты могут его заменить:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Для пакета %s не найдены кандидаты на установку"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Переустановка %s невозможна, он не загружается.\n"
+msgstr "Переустановка %s невозможна, он не скачивается.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Уже установлена самая новая версия %s.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Релиз '%s' для '%s' не найден"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Версия '%s' для '%s' не найдена"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Выбрана версия %s (%s) для %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "Нет пакета с исходным кодом '%s', вместо него берётся '%s'\n"
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Команде update не нужны аргументы"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Невозможно заблокировать каталог со списками пакетов"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Следующие пакеты устанавливались автоматически и больше не требуются:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Для их удаления используйте 'apt-get autoremove'."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1059,45 +1055,45 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "Следующая информация, возможно, поможет вам:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутренняя ошибка, AutoRemover всё поломал"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Не удалось найти задачу %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не удалось найти пакет %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s установлен вручную.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
 "f install':"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1105,7 +1101,7 @@ msgstr ""
 "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
 "не указывая имени пакета, (или найдите другое решение)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1116,121 +1112,118 @@ msgstr ""
 "или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
 "пакеты ещё не созданы или были удалены из Incoming."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Сломанные пакеты"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Будут установлены следующие дополнительные пакеты:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Предлагаемые пакеты:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Рекомендуемые пакеты:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Расчёт обновлений... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Готово"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутренняя ошибка, решатель проблем всё поломал"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
-"Укажите как минимум один пакет, для которого необходимо загрузить исходные "
-"тексты"
+"Укажите как минимум один пакет, исходный код которого необходимо получить"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
-msgstr "Невозможно найти пакет с исходными текстами для %s"
+msgstr "Невозможно найти пакет с исходным кодом для %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "Пропускаем уже загруженный файл '%s'\n"
+msgstr "Пропускаем уже скачанный файл '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостаточно места в %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
+msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
+msgstr "Необходимо получить %sб архивов исходного кода.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
-msgstr "Загрузка исходных текстов %s\n"
+msgstr "Получение исходного кода %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
-msgstr "Некоторые архивы не удалось загрузить."
+msgstr "Некоторые архивы не удалось получить."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"Распаковка исходных текстов пропущена, так как в %s уже находятся "
-"распакованные исходные тексты\n"
+msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда распаковки '%s' завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда сборки '%s' завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Порождённый процесс завершился неудачно"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для проверки зависимостей для сборки необходимо указать как минимум один "
 "пакет"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Невозможно получить информацию о зависимостях для сборки %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не имеет зависимостей для сборки.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1239,7 +1232,7 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
 "найден"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1248,32 +1241,74 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
 "версий пакета %s не удовлетворяет требованиям"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
 "пакет %s новее, чем надо"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимости для сборки %s не могут быть удовлетворены."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Обработка зависимостей для сборки завершилась неудачно"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
+#| msgid ""
+#| "Usage: apt-get [options] command\n"
+#| "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+#| "       apt-get [options] source pkg1 [pkg2 ...]\n"
+#| "\n"
+#| "apt-get is a simple command line interface for downloading and\n"
+#| "installing packages. The most frequently used commands are update\n"
+#| "and install.\n"
+#| "\n"
+#| "Commands:\n"
+#| "   update - Retrieve new lists of packages\n"
+#| "   upgrade - Perform an upgrade\n"
+#| "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+#| "   remove - Remove packages\n"
+#| "   autoremove - Remove automatically all unused packages\n"
+#| "   purge - Remove packages and config files\n"
+#| "   source - Download source archives\n"
+#| "   build-dep - Configure build-dependencies for source packages\n"
+#| "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+#| "   dselect-upgrade - Follow dselect selections\n"
+#| "   clean - Erase downloaded archive files\n"
+#| "   autoclean - Erase old downloaded archive files\n"
+#| "   check - Verify that there are no broken dependencies\n"
+#| "\n"
+#| "Options:\n"
+#| "  -h  This help text.\n"
+#| "  -q  Loggable output - no progress indicator\n"
+#| "  -qq No output except for errors\n"
+#| "  -d  Download only - do NOT install or unpack archives\n"
+#| "  -s  No-act. Perform ordering simulation\n"
+#| "  -y  Assume Yes to all queries and do not prompt\n"
+#| "  -f  Attempt to correct a system with broken dependencies in place\n"
+#| "  -m  Attempt to continue if archives are unlocatable\n"
+#| "  -u  Show a list of upgraded packages as well\n"
+#| "  -b  Build the source package after fetching it\n"
+#| "  -V  Show verbose version numbers\n"
+#| "  -c=? Read this configuration file\n"
+#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+#| "pages for more information and options.\n"
+#| "                       This APT has Super Cow Powers.\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1289,7 +1324,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1320,49 +1355,58 @@ msgstr ""
 "               apt-get [параметры] install|remove pkg1 [pkg2 ...]\n"
 "               apt-get [параметры] source pkg1 [pkg2 ...]\n"
 "\n"
-"apt-get -- простой интерфейс командной строки для загрузки и\n"
-"установки пакетов. Наиболее часто используемые команды -- update \n"
-"и install.\n"
+"apt-get -- простая программа с интерфейсом командной строки\n"
+"для скачивания и установки пакетов. Наиболее часто используемые\n"
+"команды -- update и install.\n"
 "\n"
 "Команды:\n"
-"   update - получить новые списки пакетов\n"
+"   update -  получить новые списки пакетов\n"
 "   upgrade - выполнить обновление\n"
-"   install - установить новые пакеты (имя пакета указывается\n"
-"             как libc6, а не libc6.deb)\n"
-"   remove - удалить пакеты\n"
+"   install - установить новые пакеты (на месте pkg указывается имя пакета\n"
+"             (libc6), а не имя файла (libc6.deb))\n"
+"   remove -  удалить пакеты\n"
 "   autoremove - автоматически удалить все неиспользуемые пакеты\n"
-"   purge - удалить и вычистить пакеты\n"
-"   source - загрузить архивы с исходными текстами\n"
-"   build-dep - загрузить всё необходимое для сборки указанного\n"
-"               пакета из исходных текстов\n"
+"   purge -   удалить пакеты вместе с их файлами настройки\n"
+"   source -  скачать архивы с исходным кодом\n"
+"   build-dep - настроить всё необходимое для сборки\n"
+"               пакета с исходным кодом\n"
 "   dist-upgrade - обновить всю систему, подробнее в apt-get(8)\n"
-"   dselect-upgrade - руководствоваться выбором, сделанным в dselect'е\n"
-"   clean - удалить загруженные файлы архивов\n"
-"   autoclean - удалить старые загруженные файлы архивов\n"
-"   check - проверить наличие нарушенных зависимостей\n"
+"   dselect-upgrade - руководствоваться выбором, сделанным в dselect\n"
+"   clean -   удалить скачанные файлы архивов\n"
+"   autoclean - удалить старые скачанные файлы архивов\n"
+"   check -   проверить наличие нарушенных зависимостей\n"
 "\n"
 "Параметры:\n"
-"  -h  этот текст\n"
-"  -q  выводить сообщения, пригодные для записи в файл журнала,\n"
-"      не выводить индикатор хода работы\n"
-"  -qq выводить только сообщения об ошибках\n"
-"  -d  только загрузить - НЕ устанавливать и не распаковывать архивы\n"
-"  -s  не выполнять действия на самом деле, только имитация работы\n"
-"  -y  отвечать \"Да\" на все вопросы, cами вопросы при этом не выводятся\n"
-"  -f  продолжать, даже если проверка целостности не прошла\n"
-"  -m  продолжать, даже если местоположение архивов неизвестно\n"
-"  -u  показывать также список обновляемых пакетов\n"
-"  -b  собрать пакет из исходных текстов после получения\n"
-"  -V  показать полные номера версий\n"
+"  -h   этот текст\n"
+"  -q   выводить сообщения, пригодные для записи в файл журнала,\n"
+"       не выводить индикатор хода работы\n"
+"  -qq  выводить только сообщения об ошибках\n"
+"  -d   только скачать - НЕ устанавливать и не распаковывать архивы\n"
+"  -s   не выполнять действия на самом деле, только имитация работы\n"
+"  -y   отвечать \"Да\" на все вопросы, сами вопросы при этом не выводить\n"
+"  -f   попытаться исправить систему, имеющую сломанные зависимости\n"
+"  -m   продолжать, даже если местоположение архивов неизвестно\n"
+"  -u   показывать также список обновляемых пакетов\n"
+"  -b   собрать пакет из исходного кода после его получения\n"
+"  -V   показать полные номера версий\n"
 "  -c=? читать указанный файл настройки\n"
-"  -o=? задать произвольный параметр настройки, например, -o dir::cache=/tmp\n"
-"Страницы руководства apt-get(8), sources.list(5) и apt.conf(5)\n"
+"  -o=? задать значение произвольному параметру настройки, например, -o dir::"
+"cache=/tmp\n"
+"Справочные страницы apt-get(8), sources.list(5) и apt.conf(5)\n"
 "содержат подробную информацию и описание параметров.\n"
 "                       В APT есть коровья СУПЕРСИЛА.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
-msgstr "В кеше "
+msgstr "В кэше "
 
 #: cmdline/acqprogress.cc:79
 msgid "Get:"
@@ -1414,16 +1458,17 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Использование: apt-sortpkgs [параметры] file1 [file2 ...]\n"
+"Использование: apt-sortpkgs [параметры] файл1 [файл2 ...]\n"
 "\n"
-"apt-sortpkgs - простой инструмент для сортировки списков пакетов. Опция -s\n"
-"используется, чтобы указать тип списка.\n"
+"apt-sortpkgs - простой инструмент для сортировки списков пакетов. Параметр -"
+"s\n"
+"используется для указания типа списка.\n"
 "\n"
 "Параметры:\n"
 "  -h   этот текст\n"
-"  -s   сортировать список файлов с исходными текстами\n"
-"  -c=? читать указанный файл конфигурации\n"
-"  -o=? установить произвольную опцию, например, -o dir::cache=/tmp\n"
+"  -s   сортировать список файлов пакетов исходного кода\n"
+"  -c=? читать указанный файл настройки\n"
+"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
 
 #: dselect/install:32
 msgid "Bad default setting!"
@@ -1532,7 +1577,7 @@ msgstr "Двойное добавление diversion %s -> %s"
 #: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
-msgstr "Повторно указанный конфигурационный файл %s/%s"
+msgstr "Повторно указан файл настройки %s/%s"
 
 #: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
 #, c-format
@@ -1591,9 +1636,9 @@ msgstr "Файлы заменяются содержимым пакета %s б�
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Файл %s/%s переписывает файл в пакете %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Невозможно прочитать %s"
@@ -1684,7 +1729,7 @@ msgstr "Внутренняя ошибка при добавлении diversion"
 
 #: apt-inst/deb/dpkgdb.cc:379
 msgid "The pkg cache must be initialized first"
-msgstr "В первую очередь должен быть проинициализирован кеш пакетов"
+msgstr "В первую очередь должен быть проинициализирован кэш пакетов"
 
 #: apt-inst/deb/dpkgdb.cc:439
 #, c-format
@@ -1828,7 +1873,7 @@ msgstr "Допустимое время ожидания для соединен
 msgid "Server closed the connection"
 msgstr "Сервер прервал соединение"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Ошибка чтения"
 
@@ -1840,7 +1885,7 @@ msgstr "Ответ переполнил буфер."
 msgid "Protocol corruption"
 msgstr "Искажение протокола"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Ошибка записи"
 
@@ -1896,14 +1941,14 @@ msgstr "Время установления соединения для соке
 msgid "Unable to accept connection"
 msgstr "Невозможно принять соединение"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Проблема при хешировании файла"
 
 #: methods/ftp.cc:877
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "Невозможно загрузить файл, сервер сообщил: '%s'"
+msgstr "Невозможно получить файл, сервер сообщил: '%s'"
 
 #: methods/ftp.cc:892 methods/rsh.cc:322
 msgid "Data socket timed out"
@@ -1981,42 +2026,42 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr "Невозможно соединиться с %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Нет доступа к связке (keyring) ключей: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение "
 "работы."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
 "ключа?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Найдена как минимум одна неправильная подпись."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Не удалось выполнить '%s' для проверки подписи (gpgv установлена?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестная ошибка при выполнении gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Следующие подписи неверные:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2034,80 +2079,80 @@ msgstr "Не удалось открыть канал для %s"
 msgid "Read error from %s process"
 msgstr "Ошибка чтения из процесса %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Ожидание заголовков"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Получен заголовок длиннее %u символов"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Неверный заголовок"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-сервер послал неверный заголовок"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http сервер послал неверный заголовок Content-Length"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-сервер послал неверный заголовок Content-Range"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
-msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
+msgstr "Этот HTTP-сервер не поддерживает скачивание фрагментов файлов"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Неизвестный формат данных"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Ошибка в select"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Время ожидания для соединения истекло"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Ошибка записи в выходной файл"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Ошибка чтения, удалённый сервер прервал соединение"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Ошибка чтения с сервера"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Не удалось обрезать файл"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Неверный заголовок данных"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
@@ -2120,11 +2165,40 @@ msgstr "Невозможно отобразить в память пустой �
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Невозможно отобразить в память %lu байт"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Выход за границы диапазона при работе MMap"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. "
+"Текущее значение: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liч %liмин %liс"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liч %liмин %liс"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr "%liмин %liс"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr "%liс"
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Не найдено: %s"
@@ -2137,46 +2211,46 @@ msgstr "Неизвестная аббревиатура типа: '%c'"
 #: apt-pkg/contrib/configuration.cc:497
 #, c-format
 msgid "Opening configuration file %s"
-msgstr "Открытие файла конфигурации %s"
+msgstr "Открытие файла настройки %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Синтаксическая ошибка %s:%u: искажённый тег"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем "
 "уровне"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла"
@@ -2194,38 +2268,38 @@ msgstr "%c%s... Готово"
 #: apt-pkg/contrib/cmndline.cc:77
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "Неизвестная опция командной строки '%c' [из %s]."
+msgstr "Неизвестный параметр командной строки '%c' [из %s]."
 
 #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
 #: apt-pkg/contrib/cmndline.cc:119
 #, c-format
 msgid "Command line option %s is not understood"
-msgstr "Не распознанная опция командной строки %s"
+msgstr "Не распознанный параметр командной строки %s"
 
 #: apt-pkg/contrib/cmndline.cc:124
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "Опция командной строки %s - не логический переключатель \"да/нет\""
+msgstr "Параметр командной строки %s - не логический переключатель \"да/нет\""
 
 #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
 #, c-format
 msgid "Option %s requires an argument."
-msgstr "Опция %s требует аргумента."
+msgstr "Для параметра %s требуется аргумент."
 
 #: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Опция %s: значение должно иметь вид =<val>."
+msgstr "Значение параметра %s должно иметь вид =<val>."
 
 #: apt-pkg/contrib/cmndline.cc:234
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Опция %s требует аргумент в виде целого числа, а не '%s'"
+msgstr "Для параметра %s требуется аргумент в виде целого числа, а не '%s'"
 
 #: apt-pkg/contrib/cmndline.cc:265
 #, c-format
 msgid "Option '%s' is too long"
-msgstr "Слишком длинная опция '%s'"
+msgstr "Параметр '%s' слишком длинный"
 
 #: apt-pkg/contrib/cmndline.cc:298
 #, c-format
@@ -2243,7 +2317,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Невозможно прочитать атрибуты точки монтирования %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Невозможно сменить текущий каталог на %s"
@@ -2281,145 +2355,156 @@ msgstr "Не удалось получить доступ к файлу блок
 msgid "Waited for %s but it wasn't there"
 msgstr "Ожидалось завершение процесса %s, но он не был запущен"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr ""
+"Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Порождённый процесс %s вернул код ошибки (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Порождённый процесс %s неожиданно завершился"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Не удалось открыть файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Проблема закрытия файла"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Ошибка при удалении файла"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Проблема при синхронизации файловых буферов с диском"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
-msgstr "Кеш пакетов пуст"
+msgstr "Кэш пакетов пуст"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
-msgstr "Кеш пакетов повреждён"
+msgstr "Кэш пакетов повреждён"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
-msgstr "Не поддерживаемая версия кеша пакетов"
+msgstr "Не поддерживаемая версия кэша пакетов"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Данный APT не поддерживает систему версий '%s'"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
-msgstr "Кеш пакетов был собран для другой архитектуры"
+msgstr "Кэш пакетов был собран для другой архитектуры"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Зависит"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "ПредЗависит"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Предлагает"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Рекомендует"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Конфликтует"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Заменяет"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Замещает"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Ломает"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "важный"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "необходимый"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "стандартный"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "необязательный"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "дополнительный"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Построение дерева зависимостей"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Версии-кандидаты"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Генерирование зависимостей"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Чтение информации о состоянии"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Не удалось открыть StateFile %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Не удалось записать временный StateFile %s"
@@ -2495,7 +2580,8 @@ msgstr ""
 "Вследствие возникновения циклических зависимостей типа Конфликтует/"
 "ПредЗависит, для продолжения установки необходимо временно удалить "
 "существенно важный пакет %s. Это может привести к фатальным последствиям. "
-"Если вы действительно хотите продолжить, включите опцию APT::Force-LoopBreak."
+"Если вы действительно хотите продолжить, установите параметр APT::Force-"
+"LoopBreak."
 
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
@@ -2509,7 +2595,7 @@ msgid ""
 msgstr ""
 "Пакет %s нуждается в переустановке, но найти архив для него не удалось."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2517,39 +2603,39 @@ msgstr ""
 "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
 "может быть вызвано отложенными (held) пакетами."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
-"Некоторые индексные файлы не загрузились, они были проигнорированы или "
-"вместо них были использованы старые версии"
+"Некоторые индексные файлы не скачались, они были проигнорированы или вместо "
+"них были использованы старые версии"
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Каталог %spartial отсутствует."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Архивный каталог %spartial отсутствует."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Загружается файл %li из %li (%s осталось)"
+msgstr "Скачивается файл %li из %li (осталось %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
-msgstr "Загружается файл %li из %li"
+msgstr "Скачивается файл %li из %li"
 
 #: apt-pkg/acquire-worker.cc:110
 #, c-format
@@ -2561,17 +2647,17 @@ msgstr "Драйвер для метода %s не найден."
 msgid "Method %s did not start correctly"
 msgstr "Метод %s запустился не корректно"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Менеджер пакетов '%s' не поддерживается"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Невозможно определить подходящий тип менеджера пакетов"
 
@@ -2592,22 +2678,24 @@ msgstr "Списки пакетов или status-файл не могут бы�
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Неверная запись в файле preferences: отсутствует заголовок Package"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Неизвестный тип фиксации %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Для фиксации не указан приоритет (или указан нулевой)"
 
 #: apt-pkg/pkgcachegen.cc:72
 msgid "Cache has an incompatible versioning system"
-msgstr "Кеш имеет несовместимую систему версий"
+msgstr "Кэш имеет несовместимую систему версий"
 
 #: apt-pkg/pkgcachegen.cc:115
 #, c-format
@@ -2689,7 +2777,7 @@ msgstr "Во время обработки файла зависимостей �
 #: apt-pkg/pkgcachegen.cc:690
 #, c-format
 msgid "Couldn't stat source package list %s"
-msgstr "Не удалось получить атрибуты списка пакетов с исходными текстами %s"
+msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
 
 #: apt-pkg/pkgcachegen.cc:775
 msgid "Collecting File Provides"
@@ -2697,7 +2785,7 @@ msgstr "Сбор информации о Provides"
 
 #: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
 msgid "IO Error saving source cache"
-msgstr "Ошибка ввода/вывода при попытке сохранить кеш исходных текстов"
+msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
 
 #: apt-pkg/acquire-item.cc:127
 #, c-format
@@ -2744,6 +2832,23 @@ msgstr "Некорректный перечень пакетов. Нет пол�
 msgid "Size mismatch"
 msgstr "Не совпадает размер"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Невозможно разобрать содержимое пакета %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Заметьте, вместо %2$s выбирается %1$s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2799,8 +2904,14 @@ msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
 "zu signatures\n"
 msgstr ""
-"Найдено индексов: %zu для пакетов, %zu для пакетов c исходными текстами, %zu "
-"для переводов и %zu для сигнатур\n"
+"Найдено индексов: %zu для пакетов, %zu для источников, %zu для переводов и %"
+"zu для сигнатур\n"
+
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
 
 #: apt-pkg/cdrom.cc:715
 #, c-format
@@ -2832,22 +2943,22 @@ msgstr "Запись нового списка источников\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Записи в списке источников для этого диска:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Сохранено %i записей.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2859,12 +2970,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Устанавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Настройка %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Удаление %s"
@@ -2874,63 +2985,84 @@ msgstr "Удаление %s"
 msgid "Running post-installation trigger %s"
 msgstr "Выполняется послеустановочный триггер %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Каталог %s отсутствует"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Распаковывается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
-msgstr "Подготавливается для конфигурации %s"
+msgstr "Подготавливается для настройки %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Обрабатываются триггеры для %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Установлен %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготавливается для удаления %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Удалён %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка к полному удалению %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s полностью удалён"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не "
 "смонтирован?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Невозможно заблокировать каталог со списками пакетов"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr "Не заблокирован"
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Не удалось пропатчить файл"
@@ -2938,3 +3070,9 @@ msgstr "Не удалось пропатчить файл"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Соединение закрыто преждевременно"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Обрабатываются триггеры для %s"
diff --git a/po/sk.po b/po/sk.po
index cfc3ab9b4..e0cbcb2bc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,14 +4,14 @@
 # thanks to Miroslav Kure <kurem@debian.cz>
 #
 # Peter Mann <Peter.Mann@tuke.sk>, 2006.
-# Ivan Masár <helix84@centrum.sk>, 2008.
+# Ivan Masár <helix84@centrum.sk>, 2008, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-12 23:06+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-07-21 12:45+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -19,153 +19,148 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nedá sa nájsť balík %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Celkom názvov balíkov: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Normálnych balíkov: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Zmiešaných virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Chýbajúcich: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Celkom rôznych verzií: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Celkom rôznych popisov: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Celkom závislostí: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Celkom vzťahov ver/súbor: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Celkom vzťahov popis/súbor: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Celkom poskytnutých mapovaní: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Celkom globovaných reťazcov: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Celkom miesta závislých verzií: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Celkom jalového miesta: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Celkom priradeného miesta: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Súbor balíkov %s je neaktuálny."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Musíte zadať práve jeden vzor"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Neboli nájdené žiadne balíky"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Súbory balíka:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Vyrovnávacia pamäť je neaktuálna, nedá sa odvolať na súbor balíka"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Pripevnené balíky:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(nenájdené)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Nainštalovaná verzia: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(žiadna)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Pripevnený balík:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Tabuľka verzií:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pre %s skompilovaný %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -307,7 +302,7 @@ msgstr ""
 "a šablón z balíkov Debian\n"
 "\n"
 "Voľby:\n"
-"  -h   Tento pomocnék.\n"
+"  -h   Tento pomocník.\n"
 "  -t   Nastaví dočasný adresár\n"
 "  -c=? Načíta tento konfiguračný súbor\n"
 "  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
@@ -496,7 +491,7 @@ msgstr "E: Chyby sa týkajú súboru "
 #: ftparchive/writer.cc:158 ftparchive/writer.cc:188
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "Chyba pri prklade %s"
+msgstr "Chyba pri preklade %s"
 
 #: ftparchive/writer.cc:170
 msgid "Tree walking failed"
@@ -602,7 +597,7 @@ msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu"
 
 #: ftparchive/multicompress.cc:169 methods/rsh.cc:91
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "Zlyhalo vytvorenie medziprocesovej rúry k podprocesu"
+msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu"
 
 #: ftparchive/multicompress.cc:195
 msgid "Failed to create FILE*"
@@ -651,79 +646,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba pri preklade regulárneho výrazu - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Nasledovné balíky majú nesplnené závislosti:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "ale nainštalovaný je %s"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale inštalovať sa bude %s"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "ale sa nedá nainštalovať"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "ale je to virtuálny balík"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "ale nie je nainštalovaný"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "ale sa nebude inštalovať"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " alebo"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Nasledovné balíky sa ODSTRÁNIA:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Nasledovné balíky sa aktualizujú:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Nasledovné balíky sa DEGRADUJÚ:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Nasledovné pridržané balíky sa zmenia:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (kvôli %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -731,145 +726,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinštalovaných, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradovaných, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, 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:593
+#: cmdline/apt-get.cc:596
 #, 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:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Opravujú sa závislosti..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " zlyhalo."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Závislosti sa nedajú opraviť"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Sada na aktualizáciu sa nedá minimalizovať"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Hotovo"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "Opravu môžete spustiť pomocu „apt-get -f install“."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nesplnené závislosti. Skúste použiť -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 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:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnútorná chyba, Triedenie sa neukončilo"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Adresár pre sťahovanie sa nedá zamknúť"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nedá sa načítať zoznam zdrojov."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Je potrebné stiahnuť %sB archívov.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, 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:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Áno, urob to, čo vravím!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -880,28 +875,28 @@ msgstr ""
 "Ak chcete pokračovať, opíšte frázu „%s“\n"
 " ?]"
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Prerušené."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovať [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Zlyhalo stiahnutie %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Niektoré súbory sa nedajú stiahnuť"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -909,47 +904,47 @@ msgstr ""
 "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
 "fix-missing"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Chýbajúce balíky sa nedajú opraviť."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Inštalácia sa prerušuje."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Poznámka: %s sa vyberá namiesto %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Balík %s je virtuálny balík poskytovaný balíkmi:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr "[Inštalovaný]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Mali by ste explicitne vybrať jeden na inštaláciu."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -959,64 +954,69 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Avšak nahrádzajú ho nasledovné balíky:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Balík %s nemá kandidáta na inštaláciu"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s je už najnovšej verzie.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nebola nájdená verzia „%s“ pre „%s“"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Zvolená verzia %s (%s) pre %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "Zdrojový balík „%s“ neexistuje, namiesto neho sa použije „%s“\n"
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Príkaz update neprijíma žiadne argumenty"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Adresár zoznamov sa nedá zamknúť"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Na ich odstránenie použite „apt-get autoremove“."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1034,43 +1034,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nebolo možné nájsť úlohu %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Balík %s sa nedá nájsť"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je nastavený na manuálnu inštaláciu.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1078,7 +1078,7 @@ msgstr ""
 "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
 "navrhnite riešenie)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1090,157 +1090,157 @@ msgstr ""
 "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
 "Novoprichádzajúcich (Incoming) balíkov."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Nainštalujú sa nasledovné extra balíky:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Odporúčané balíky:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Prepočítava sa aktualizácia... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Chyba"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, 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:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, 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:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stiahnuť zdroj %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorých archívov."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nedajú sa získať závislosti na zostavenie %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žiadne závislosti na zostavenie.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, 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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
-"%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíka %s, "
+"%s závislosť pre %s sa nedá splniť, pretože sa nedá nájsť verzia balíka %s, "
 "ktorá zodpovedá požiadavke na verziu"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti na zostavenie %s sa nedajú splniť."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1256,7 +1256,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1297,7 +1297,7 @@ msgstr ""
 "deb)\n"
 "   remove          - Odstráni balíky\n"
 "   autoremove      - Automaticky odstráni všetky nepoužité balíky\n"
-"   purge           - Odstráni a vyčistí balíky\n"
+"   purge           - Odstráni a balíky a ich konfiguračné súbory\n"
 "   source          - Stiahne zdrojové archívy\n"
 "   build-dep       - Nastaví závislosti kompilácie pre zdrojové balíky\n"
 "   dist-upgrade    - Aktualizácia distribúcie, viď apt-get(8)\n"
@@ -1324,6 +1324,18 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tento APT má schopnosti posvätnej kravy.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+"POZN.: Toto je iba simulácia!\n"
+"      apt-get potrebuje na skutočné spustenie práva používateľa root.\n"
+"      Tiež pamätajte, že zamykanie je deaktivované, takže\n"
+"      sa nespoliehajte na to že to bude platiť v reálnej situácii!"
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Už existuje "
@@ -1443,7 +1455,7 @@ msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
 #: apt-inst/contrib/extracttar.cc:296
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
-msgstr "Neznáma hlavička TARu typ %u, člen %s"
+msgstr "Neznáma TAR hlavička typu %u, člen %s"
 
 #: apt-inst/contrib/arfile.cc:70
 msgid "Invalid archive signature"
@@ -1471,7 +1483,7 @@ msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
 
 #: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
-msgstr "Hashovací prvok sa nedá nájsť!"
+msgstr "Hašovací prvok sa nedá nájsť!"
 
 #: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
@@ -1537,7 +1549,7 @@ msgstr "Adresár %s sa nahradí neadresárom"
 
 #: apt-inst/extract.cc:280
 msgid "Failed to locate node in its hash bucket"
-msgstr "Nedá sa nájsť uzol v jeho hashovacej oblasti"
+msgstr "Nedá sa nájsť uzol na adrese jeho hašu"
 
 #: apt-inst/extract.cc:284
 msgid "The path is too long"
@@ -1553,9 +1565,9 @@ msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Súbor %s/%s prepisuje ten z balíka %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nedá sa načítať %s"
@@ -1693,14 +1705,14 @@ msgstr "Nespracovateľný riadiaci súbor"
 #: methods/cdrom.cc:114
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr "Nedá sa čítať databáza na cdrom %s"
+msgstr "Nedá sa čítať databáza na CD-ROM %s"
 
 #: methods/cdrom.cc:123
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
-"Pre pridanie CD do APT použijte apt-cdrom. apt-get update sa nedá využiť na "
+"Pre pridanie CD do APT použije apt-cdrom. apt-get update sa nedá využiť na "
 "pridávanie nových CD."
 
 #: methods/cdrom.cc:131
@@ -1787,7 +1799,7 @@ msgstr "Uplynul čas spojenia"
 msgid "Server closed the connection"
 msgstr "Server ukončil spojenie"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Chyba pri čítaní"
 
@@ -1799,7 +1811,7 @@ msgstr "Odpoveď preplnila zásobník."
 msgid "Protocol corruption"
 msgstr "Narušenie protokolu"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Chyba pri zápise"
 
@@ -1853,7 +1865,7 @@ msgstr "Uplynulo spojenie dátového socketu"
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedá prijať"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problém s hašovaním súboru"
 
@@ -1937,40 +1949,40 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Nedá sa pripojiť k %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Zväzok kľúčov „%s“ je nedostupný."
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliš dlhý. Ukončuje "
 "sa."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Bola zistená aspoň jedna nesprávna signatúra."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Nedá sa spustiť „%s“ na kontrolu signatúry (je nainštalované gpgv?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Neznáma chyba pri spustení gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Nasledovné signatúry sú neplatné:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1988,80 +2000,80 @@ msgstr "Nedá sa otvoriť rúra pre %s"
 msgid "Read error from %s process"
 msgstr "Chyba pri čítaní z procesu %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Čaká sa na hlavičky"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Chybná hlavička"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP server poslal neplatnú hlavičku odpovede"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má poškodenú podporu rozsahov"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Neznámy formát dátumu"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Výber zlyhal"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Uplynul čas spojenia"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do tohto súboru"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Chyba pri čítaní zo servera"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Nepodarilo sa skrátiť súbor"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
@@ -2074,11 +2086,40 @@ msgstr "Nedá sa vykonať mmap prázdneho súboru"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Nedá sa urobiť mmap %lu bajtov"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamickému MMap došlo miesto"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
+"Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li d %li h %li min %li s"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr "%li min %li s"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr "%li s"
 
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Voľba %s nenájdená"
@@ -2093,43 +2134,43 @@ msgstr "Nerozpoznaná skratka typu: „%c“"
 msgid "Opening configuration file %s"
 msgstr "Otvára sa konfiguračný súbor %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaktická chyba %s:%u: Skomolená značka"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntaktická chyba %s:%u: Direktívy sa dajú vykonať len na najvyššej úrovni"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaktická chyba %s:%u: Príliš mnoho vnorených prepojení (include)"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje"
@@ -2196,14 +2237,14 @@ msgid "Unable to stat the mount point %s"
 msgstr "Prípojný bod %s sa nedá vyhodnotiť"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nedá sa prejsť do %s"
 
 #: apt-pkg/contrib/cdromutl.cc:188
 msgid "Failed to stat the cdrom"
-msgstr "Nedá sa vyhodnotiť cdrom"
+msgstr "Nedá sa vykonať stat() CD-ROM"
 
 #: apt-pkg/contrib/fileutl.cc:149
 #, c-format
@@ -2218,7 +2259,7 @@ msgstr "Súbor zámku %s sa nedá otvoriť"
 #: apt-pkg/contrib/fileutl.cc:172
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Zamykanie pre súbor zámku %s pripojený cez nfs sa nepoužíva"
+msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva"
 
 #: apt-pkg/contrib/fileutl.cc:176
 #, c-format
@@ -2230,143 +2271,153 @@ msgstr "Zámok %s sa nedá získať"
 msgid "Waited for %s but it wasn't there"
 msgstr "Čakalo sa na %s, ale nebolo to tam"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s obdržal chybu segmentácie."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Podproces %s obdržal chybu segmentácie."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s vrátil chybový kód (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s neočakávane skončil"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nedá sa otvoriť súbor %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "čítanie, stále treba prečítať %lu, ale už nič neostáva"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "zápis, stále treba zapísať %lu, no nedá sa to"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problém pri zatváraní súboru"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problém pri odstraňovaní súboru"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problém pri synchronizovaní súboru"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Vyrovnávacia pamäť balíkov je prázdna"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 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:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Tento APT nepodporuje systém na správu verzií „%s“"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Závisí na"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Predzávisí na"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Odporúča"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Nahrádza"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Zneplatňuje"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Kazí"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr "Rozširuje"
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "dôležitý"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "požadovaný"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "štandardný"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "voliteľný"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Vytvára sa strom závislostí"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Kandidátske verzie"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Generovanie závislostí"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Načítavajú sa stavové informácie"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Nie je možné otvoriť StateFile %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Nie je možné zapísať dočasný StateFile %s"
@@ -2453,7 +2504,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2461,11 +2512,11 @@ msgstr ""
 "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
 "pridržanými balíkmi."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 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."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2473,24 +2524,24 @@ msgstr ""
 "Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované alebo sa "
 "použili staršie verzie."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Adresár zoznamov %spartial chýba."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Archívny adresár %spartial chýba."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Sťahuje sa %li. súbor z %li"
@@ -2505,17 +2556,17 @@ msgstr "Nedá sa nájsť ovládač spôsobu %s."
 msgid "Method %s did not start correctly"
 msgstr "Spôsob %s nebol správne spustený"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Systém balíkov „%s“ nie je podporovaný"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nedá sa určiť vhodný typ systému balíkov"
 
@@ -2536,16 +2587,18 @@ msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvor
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Neplatný záznam v súbore „preferences“, žiadne záhlavie balíka"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nezrozumiteľné pridržanie typu %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
 
@@ -2689,6 +2742,23 @@ msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre bal�
 msgid "Size mismatch"
 msgstr "Veľkosti sa nezhodujú"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Súbor %s sa nedá spracovať (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Poznámka: %s sa vyberá namiesto %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2747,6 +2817,12 @@ msgstr ""
 "Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov "
 "prekladov a %zu signatúr\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2777,22 +2853,22 @@ msgstr "Zapisuje sa nový zoznam zdrojov\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapísaných %i záznamov.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, 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"
@@ -2802,12 +2878,12 @@ msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
 msgid "Installing %s"
 msgstr "Inštaluje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuje sa %s"
@@ -2817,63 +2893,84 @@ msgstr "Odstraňuje sa %s"
 msgid "Running post-installation trigger %s"
 msgstr "Vykonáva sa spúšťač post-installation %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresár „%s“ chýba"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaľuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravuje sa nastavenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Spracovávajú sa spúšťače %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Nainštalovaný balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravuje sa odstránenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Odstránený balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pripravuje sa úplné odstránenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Balík „%s“ je úplne odstránený"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
 "pripojený?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Adresár zoznamov sa nedá zamknúť"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr "Nie je zamknuté"
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Nedá sa upraviť súbor"
@@ -2882,6 +2979,15 @@ msgstr "Nedá sa upraviť súbor"
 msgid "Connection closed prematurely"
 msgstr "Spojenie bolo predčasne ukončené"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Spracovávajú sa spúšťače %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamickému MMap došlo miesto"
+
 #~ 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"
diff --git a/po/sl.po b/po/sl.po
index 5f36b70b4..23cf96f50 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2005-02-16 22:18+0100\n"
 "Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -12,192 +12,151 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s razli�ica %s ima nere�ene odvisnosti:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne najdem paketa %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Vseh imen paketov:"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr " Navadni paketi:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr " �isti navidezni paketi:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr " Posamezni navidezni paketi:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr " Me�ani navidezni paketi:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr " Manjka: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Vseh razli�ic:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Vseh razli�ic:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Vseh odvisnosti:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Vseh povezava Raz/Dat:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Vseh povezava Raz/Dat:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Vseh dobljenih preslikav: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Vseh raz�irjenih nizov: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Celotna velikost z odvisnostmi: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Celotna ohlapna velikost: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Celotna velikost, izra�unana za: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketna datoteka %s ni usklajena."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Podati morate natan�no en vzorec"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Nobena datoteka ni bila najdena"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Paketne datoteke:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Pripeti paketi:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(ni najden)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Name��en: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(brez)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr " Kandidat:"
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr " Zaponka paketa:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr " Tabela razli�ic:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s za %s %s preveden na %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -686,79 +645,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Napaka pri prevajanju regex - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Naslednji paketi imajo nere�ene odvisnosti:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "vendar je paket %s name��en"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "vendar bo paket %s name��en"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "vendar se ga ne da namestiti"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "vendar je navidezen paket"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "vendar ni name��en"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "vendar ne bo name��en"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " ali"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Naslednji NOVI paketi bodo name��eni:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Naslednji paketi so bili zadr�ani:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Naslednji paketi bodo nadgrajeni:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Naslednji paketi bodo POSTARANI:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Naslednji zadr�ani paketi bodo spremenjeni:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (zaradi %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -767,144 +726,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu nadgrajenih, %lu na novo name��enih, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu posodobljenih, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu postaranih, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ne popolnoma name��enih ali odstranjenih.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Popravljanje odvisnosti ..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " spodletelo."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Ni mogo�e popraviti odvisnosti"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Ni mogo�e pomanj�ati zbirke za nadgradnjo"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Opravljeno"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nere�ene odvisnosti. Poskusite uporabiti -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "POZORO: Naslednjih paketov ni bilo mogo�e avtenticirati!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Namestim te pakete brez prevejanje [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Nisem uspel avtenticirati nekaterih paketkov"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogo�eno."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Notranja napaka pri dodajanju odklona"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Ni mogo�e zakleniti imenika za prenose"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Seznama virov ni mogo�e brati."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Potrebno je dobiti %sB/%sB arhivov.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Potrebno je dobiti %sB arhivov.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po odpakiranju bo spro��enega %sB prostora na disku.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nimate dovolj prostora na %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "V %s je premalo prostora."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Da, naredi tako kot pravim!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -915,28 +874,28 @@ msgstr ""
 "Za nadaljevanje vnesite frazo '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Prekini."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ali �elite nadaljevati [Y/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ni mogo�e dobiti %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Prenos nekaterih datotek ni uspel"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Prenos dokon�an in uporabljen na�in samo prenos"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -944,47 +903,47 @@ msgstr ""
 "Nekaterih arhivov ni mogo�e dobiti. Poskusite uporabiti apt-get update ali --"
 "fix-missing."
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Ni mogo�e popraviti manjkajo�ih paketov."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Prekinjanje namestitve."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Opomba: izbran %s namesto %s \n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Name��eno]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Sami izberite paket, ki ga �elite namestiti."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -995,64 +954,69 @@ msgstr ""
 "To ponavadi pomeni, da paket manjka, je zastaran ali\n"
 "pa je na voljo samo iz drugega vira.\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Kakorkoli, naslednji paketi ga nadomestijo:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Paket %s nima kandidata za namestitev"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, 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:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Izdaje '%s' za '%s' ni mogo�e najti"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Razli�ice '%s' za '%s' ni mogo�e najti"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Izbrana razli�ica %s (%s) za %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Ukaz update ne potrebuje argumentov"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Imenika seznamov ni mogo�e zakleniti"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Naslednji NOVI paketi bodo name��eni:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1068,44 +1032,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Ni mogo�e najti paketa %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ni mogo�e najti paketa %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Opomba: izbran %s namesto regex '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "vendar bo paket %s name��en"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1113,7 +1077,7 @@ msgstr ""
 "Nere�ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
 "podajte re�itev)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1124,126 +1088,126 @@ 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:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Pokvarjeni paketi"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Naslednji dodatni paketi bodo name��eni:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Predlagani paketi:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Priporo�eni paketi:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Prera�unavanje nadgradnje ... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Spodletelo"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Opravljeno"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Izvornega paketa za %s ni mogo�e najti"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, 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:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nimate dovolj prostora na %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Dobi vir %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Nekaterih arhivov ni mogo�e dobiti."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Ukaz gradnje '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Otro�ki proces ni uspel"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nima odvisnosti za gradnjo.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, 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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1252,31 +1216,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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Odvisnostim za gradnjo %s ni mogo�e zadostiti."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Obdelava odvisnosti za gradnjo ni uspela"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1293,7 +1257,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1359,6 +1323,14 @@ msgstr ""
 "sources.list(5) in apt.conf(5).\n"
 "                       APT ima mo� Super Krave.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Zadetek "
@@ -1590,9 +1562,9 @@ msgstr "Prepi�i zadetek paketa brez vnosa razli�ice za %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni mogo�e brati %s"
@@ -1824,7 +1796,7 @@ msgstr "Povezava potekla"
 msgid "Server closed the connection"
 msgstr "Stre�nik je zaprl povezavo"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Napaka pri branju"
 
@@ -1836,7 +1808,7 @@ msgstr "Odgovor je prekora�il vmesnik."
 msgid "Protocol corruption"
 msgstr "Okvara protokola"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Napaka pri pisanju"
 
@@ -1890,7 +1862,7 @@ msgstr "Povezava podatkovne vti�nice potekla"
 msgid "Unable to accept connection"
 msgstr "Ni mogo�e sprejeti povezave"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Te�ava pri razpr�evanju datoteke"
 
@@ -1974,39 +1946,39 @@ msgstr "Pri�lo je do napake pri razre�evanju '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Ni se mogo�e povezati z %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Ni mogo�e razre�iti '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Naslednji dodatni paketi bodo name��eni:"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2022,81 +1994,81 @@ msgstr "Ni mogo�e odprti %s"
 msgid "Read error from %s process"
 msgstr "Napaka pri branju iz procesa %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "�akanje na glave"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Dobljena je ena vrstica glave preko %u znakov"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Napa�na vrstica glave"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Stre�nik HTTP je poslal napa�no glavo odgovora"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Ta stre�nik HTTP ima pokvarjen obseg podpore"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Neznana oblika datuma"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Izbira ni uspela"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "�as za povezavo se je iztekel"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Napaka pri pisanju v izhodno datoteko"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Napaka pri pisanju v datoteko"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Napaka pri pisanju v datoteko"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Napaka pri branju oddaljene in zaprte povezave s stre�nika "
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Napaka pri branju s stre�nika"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Napaka pri pisanju datoteke %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Napa�ni podatki glave"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Notranja napaka"
 
@@ -2109,11 +2081,38 @@ 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/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Izbira %s ni mogo�e najti"
@@ -2128,43 +2127,43 @@ msgstr "Ne-prepoznan tip okraj�ave: '%c'"
 msgid "Opening configuration file %s"
 msgstr "Odpiranje nastavitvene datoteke %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Skladenjska napaka %s:%u: Blok se za�ne brez imena."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Skladenjska napaka %s:%u: Nepravilna zna�ka."
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Skladenjska napaka %s:%u: Dodatno smetje za vrednostjo."
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnjem nivoju."
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Skladenjska napaka %s:%u: Preve� ugnezdenih vklju�itev."
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Skladenjska napaka %s:%u: Vklju�en od tu."
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke"
@@ -2231,7 +2230,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Ni mogo�e dolo�iti priklopne to�ke %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ni mogo�e spremeniti v %s"
@@ -2265,144 +2264,154 @@ msgstr "Ni mogo�e dobiti zaklenjene datoteke %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "�akal, a %s ni bil tam"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Napaka pri raz�lenjenosti podprocesa %s."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Napaka pri raz�lenjenosti podprocesa %s."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s je vrnil kodo napake (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s se je nepri�akovano zaklju�il"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Ne morem odpreti datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "berem, �e vedno %lu za branje, a nobeden ostal"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "pi�em, �e vedno %lu za pisanje, a ni mogo�e"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Te�ava pri zapiranju datoteke"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Te�ava pri odvezovanju datoteke"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Te�ava pri usklajevanju datoteke"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Prazen predpomnilnik paketov"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Datoteka s predpomnilnikom paketov je pokvarjena"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Razli�ica datoteke s predpomnilnikom paketov ni ustrezna"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Predpomnilnik paketov je bil zgrajen za druga�no arhitekturo"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Odvisen od"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Predodvisnost"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Priporo�a"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Priporo�a"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "V sporu z"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Zamenja"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Zastarani"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "pomembno"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "obvezno"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standardno"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "izbirno"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "dodatno"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Gradnja drevesa odvisnosti"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Razli�ice kandidatov"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Ustvarjanje odvisnosti"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 #, fuzzy
 msgid "Reading state information"
 msgstr "Spajanje informacij na voljo"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Ni mogo�e odprti %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Napaka pri pisanju datoteke %s"
@@ -2490,7 +2499,7 @@ msgid ""
 msgstr ""
 "Paket %s mora biti ponovno name��en, vendar ne morem najti arhiva zanj."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2498,11 +2507,11 @@ msgstr ""
 "Napaka. pkgProblemResolver::Napake pri razre�itvi, ki so jih morda "
 "povzro�ili zadr�ani paketi."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ni mogo�e popraviti te�av. Imate zadr�ane pakete."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2510,24 +2519,24 @@ msgstr ""
 "Nekaterih kazal ni mogo�e prenesti, zato so preklicana, ali pa so "
 "uporabljena starej�a."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Manjka imenik s seznami %spartial."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Manjka imenik z arhivi %spartial."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Branje seznama datotek"
@@ -2542,7 +2551,7 @@ msgstr "Ni mogo�e najti gonilnika metod %s."
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s se ni za�ela pravilno"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
@@ -2550,12 +2559,12 @@ msgstr ""
 " '%s'\n"
 "v enoto '%s' in pritisnite enter\n"
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketni sistem '%s' ni podprt"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni mogo�e ugotoviti ustrezne vrste paketnega sistema"
 
@@ -2576,16 +2585,18 @@ msgstr "Ni mogo�e odprti ali raz�leniti seznama paketov ali datoteke stanja."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "�e �elite odpraviti te�ave, poskusite zagnati apt-get update."
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Napa�en zapis v datoteki z nastavitvami. Ni glave paketa"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Ni mogo�e razumeti vrste zaponke %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Prioriteta zaponke ni dolo�ena ali pa je ni�."
 
@@ -2731,6 +2742,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Neujemanje velikosti"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Ni mogo�e raz�leniti paketne datoteke %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Opomba: izbran %s namesto %s \n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2788,6 +2816,12 @@ msgid ""
 "zu signatures\n"
 msgstr "Na�el sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
@@ -2818,22 +2852,22 @@ msgstr "Pi�em nov seznam virov\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Izvorni vnosi za ta medij so:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapisal %i zapisov.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2845,12 +2879,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "  Name��en: "
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Povezujem se z %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Odpiram %s"
@@ -2860,61 +2894,82 @@ msgstr "Odpiram %s"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Manjka imenik s seznami %spartial."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Odpiram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Odpiram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Odpiranje nastavitvene datoteke %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "Napaka pri obdelavi imenika %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Name��en: "
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Priporo�a"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Odpiranje nastavitvene datoteke %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Odstranitev %s ni uspela"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Imenika seznamov ni mogo�e zakleniti"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 #, fuzzy
 msgid "Could not patch file"
@@ -2924,6 +2979,13 @@ msgstr "Ne morem odpreti datoteke %s"
 msgid "Connection closed prematurely"
 msgstr "Povezava se je prezgodaj zaprla"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Napaka pri obdelavi imenika %s"
+
 #~ 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"
diff --git a/po/sv.po b/po/sv.po
index 7fca71fbb..1f7b80cca 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,169 +1,163 @@
 # Advanced Package Tool - APT message translation catalog
 # Swedish messages
 # Peter Karlsson <peterk@debian.org>, 2002-2008.
-# Daniel Nylander <po@danielnylander.se>, 2005-2008.
+# Daniel Nylander <po@danielnylander.se>, 2005-2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-13 00:28+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-03-03 23:15+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@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:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 "Paketet %s med versionen %s har ett beroende som inte kan tillfredsställas:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Totalt antal paketnamn: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Normala paket: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Rent virtuella paket: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Enstaka virtuella paket: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Blandade virtuella paket: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Saknade: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Totalt antal olika versioner: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Totalt antal olika beskrivningar: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Totalt antal beroenden: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Totalt antal version/filrelationer: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Totalt antal beskrivning/filrelationer: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Totalt antal tillhandahållningsmarkeringar: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Totalt antal sökmönstersträngar: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Totalt utrymme för versionsberoenden: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Totalt bortkastat utrymme: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Totalt utrymme som kan redogöras för: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketfilen %s är inte synkroniserad."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Du måste ange exakt ett mönster"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Inga paket hittades"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "\"Package\"-filer:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cachen är inte synkroniserad, kan inte korsreferera en paketfil"
 
-# Prioritet följt av URI
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Fastnålade paket:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(hittades inte)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Installerad: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(ingen)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Paketnålning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Versionstabell:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s för %s kompilerad den %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -336,7 +330,7 @@ msgstr "Listan över filtillägg för Sources är för lång"
 
 #: ftparchive/apt-ftparchive.cc:368
 msgid "Error writing header to contents file"
-msgstr "Fel vid skrivning av huvud till innehållsfil"
+msgstr "Fel vid skrivning av rubrik till innehållsfil"
 
 #: ftparchive/apt-ftparchive.cc:398
 #, c-format
@@ -655,79 +649,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fel vid kompilering av reguljärt uttryck - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s är installerat"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s kommer att installeras"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "men det kan inte installeras"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "men det är ett virtuellt paket"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "men det är inte installerat"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "men det kommer inte att installeras"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Följande NYA paket kommer att installeras:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Följande paket kommer att TAS BORT:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Följande paket har hållits tillbaka:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Följande paket kommer att uppgraderas:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Följande paket kommer att NEDGRADERAS:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Följande tillbakahållna paket kommer att ändras:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (på grund av %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -735,147 +729,147 @@ msgstr ""
 "VARNING: Följande systemkritiska paket kommer att tas bort.\n"
 "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu att uppgradera, %lu att nyinstallera, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu att installera om, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu att nedgradera, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu är inte helt installerade eller borttagna.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Korrigerar beroenden...."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " misslyckades."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Kunde inte korrigera beroenden"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Kunde inte minimera uppgraderingsuppsättningen"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Färdig"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Otillfredsställda beroenden. Prova med -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VARNING: Följande paket kunde inte autentiseras!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Autentiseringsvarning åsidosatt.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installera dessa paket utan verifiering [j/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Några av paketen kunde inte autentiseras"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internt fel. Sorteringen färdigställdes inte"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Kunde inte låsa hämtningskatalogen"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Listan över källor kunde inte läsas."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Behöver hämta %sB/%sB arkiv.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Behöver hämta %sB arkiv.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Efter denna åtgärd kommer ytterligare %sB utrymme användas på disken.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunde inte fastställa ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Ja, gör som jag säger!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -887,28 +881,28 @@ msgstr ""
 " ?] "
 
 # Visas då man svarar nej
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Avbryter."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vill du fortsätta [J/n]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Misslyckades med att hämta %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Misslyckades med att hämta vissa filer"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -916,48 +910,48 @@ msgstr ""
 "Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --"
 "fix-missing."
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing och mediabyte stöds inte för tillfället"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Kunde inte korrigera saknade paket."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Avbryter installationen."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, 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:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Installerat]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Du bör uttryckligen ange ett att installera."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -968,65 +962,70 @@ msgstr ""
 "Det kan betyda att paketet saknas, har blivit föråldrat eller endast\n"
 "är tillgängligt från andra källor\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Dock kan följande paket ersätta det:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Paketet %s har ingen installationskandidat"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s är redan den senaste versionen.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version \"%s\" för \"%s\" hittades inte"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Vald version %s (%s) för %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Uppdateringskommandot tar inga argument"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Kunde inte låsa listkatalogen"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Följande paket har installerats automatiskt och är inte längre nödvändiga:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Använd \"apt-get autoremove\" för att ta bort dem."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1044,44 +1043,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internt fel, AutoRemover förstörde något"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internt fel, AllUpgrade förstörde något"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Kunde inte hitta funktionen %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s är satt till manuellt installerad.\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1089,7 +1088,7 @@ msgstr ""
 "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
 "(eller ange en lösning)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1101,115 +1100,115 @@ msgstr ""
 "att några nödvändiga paket ännu inte har skapats eller flyttats\n"
 "ut från \"Incoming\"."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Trasiga paket"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Följande ytterligare paket kommer att installeras:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Föreslagna paket:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Rekommenderade paket:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Beräknar uppgradering... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Färdig"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internt fel, problemlösaren förstörde någonting"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du måste ange minst ett paket att hämta källkod för"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, 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:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar över redan hämtade filen \"%s\"\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Behöver hämta %sB källkodsarkiv.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hämtar källkoden %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Misslyckades med att hämta vissa arkiv."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Packar inte upp redan uppackad källkod i %s\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggkommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Barnprocessen misslyckades"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunde inte hämta information om byggberoenden för %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1218,7 +1217,7 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1227,32 +1226,33 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
 "versioner av paketet %s tillfredsställer versionskraven"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
 "paketet %s är för nytt"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggberoenden för %s kunde inte tillfredsställas."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Misslyckades med att behandla byggberoenden"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1268,7 +1268,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1335,6 +1335,14 @@ msgstr ""
 "för mer information och flaggor.\n"
 "                     Denna APT har Speciella Ko-Krafter.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 # Måste vara tre bokstäver(?)
 # "Hit" = aktuell version är fortfarande giltig
 #: cmdline/acqprogress.cc:55
@@ -1461,7 +1469,7 @@ msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
 #: apt-inst/contrib/extracttar.cc:296
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
-msgstr "Okänd TAR-huvudtyp %u, del %s"
+msgstr "Okänd TAR-rubriktyp %u, del %s"
 
 #: apt-inst/contrib/arfile.cc:70
 msgid "Invalid archive signature"
@@ -1469,11 +1477,11 @@ msgstr "Ogiltig arkivsignatur"
 
 #: apt-inst/contrib/arfile.cc:78
 msgid "Error reading archive member header"
-msgstr "Fel vid läsning av huvud för arkivdel"
+msgstr "Fel vid läsning av rubrik för arkivdel"
 
 #: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
 msgid "Invalid archive member header"
-msgstr "Ogiltigt arkivdelshuvud"
+msgstr "Ogiltigt arkivdelsrubrik"
 
 #: apt-inst/contrib/arfile.cc:128
 msgid "Archive is too short"
@@ -1481,7 +1489,7 @@ msgstr "Arkivet är för kort"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Failed to read the archive headers"
-msgstr "Misslyckades med att läsa arkivhuvuden"
+msgstr "Misslyckades med att läsa arkivrubriker"
 
 #: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
@@ -1571,9 +1579,9 @@ msgstr "Skriv över paketträff utan version för %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Filen %s/%s skriver över den i paketet %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunde inte läsa %s"
@@ -1669,7 +1677,7 @@ msgstr "Paketcachen måste först initieras"
 #: apt-inst/deb/dpkgdb.cc:439
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
-msgstr "Misslyckades med att hitta Package:-huvud, position %lu"
+msgstr "Misslyckades med att hitta Package:-rubrik, position %lu"
 
 #: apt-inst/deb/dpkgdb.cc:461
 #, c-format
@@ -1806,7 +1814,7 @@ msgstr "Tidsgränsen för anslutningen överskreds"
 msgid "Server closed the connection"
 msgstr "Servern stängde anslutningen"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Läsfel"
 
@@ -1818,7 +1826,7 @@ msgstr "Ett svar spillde bufferten."
 msgid "Protocol corruption"
 msgstr "Protokollet skadat"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Skrivfel"
 
@@ -1872,7 +1880,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutningen"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem med att lägga filen till hashtabellen"
 
@@ -1960,41 +1968,41 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Kunde inte ansluta till %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Kunde inte komma åt nyckelring: \"%s\""
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Internt fel: Korrekt signatur men kunde inte fastställa nyckelns "
 "fingeravtryck?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ogiltig signatur träffades på."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunde inte köra \"%s\" för att verifiera signatur (är gpgv installerad?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Okänt fel vid körning av gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Följande signaturer är ogiltiga:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2013,80 +2021,80 @@ msgstr "Kunde inte öppna rör för %s"
 msgid "Read error from %s process"
 msgstr "Läsfel från %s-processen"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
-msgstr "Väntar på huvuden"
+msgstr "Väntar på rubriker"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
-msgstr "Fick en ensam huvudrad på %u tecken"
+msgstr "Fick en ensam rubrikrad på %u tecken"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
-msgstr "Felaktig huvudrad"
+msgstr "Felaktig rubrikrad"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-servern sände ett ogiltigt svarshuvud"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Http-servern sände ett ogiltigt Content-Length-huvud"
+msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Http-servern sände ett ogiltigt Content-Range-huvud"
+msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Okänt datumformat"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "\"Select\" misslyckades"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Anslutningen överskred tidsgränsen"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 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:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "Misslyckades med att kapa av filen"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Felaktiga data i huvud"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Internt fel"
 
@@ -2099,11 +2107,40 @@ msgstr "Kan inte utföra mmap på en tom fil"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Kunde inte utföra mmap på %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamisk MMap fick slut på utrymme"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
+"Aktuellt värde: %lu. (man 5 apt.conf)"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valet %s hittades inte"
@@ -2118,42 +2155,42 @@ msgstr "Okänd typförkortning: \"%c\""
 msgid "Opening configuration file %s"
 msgstr "Öppnar konfigurationsfilen %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaxfel %s:%u: Block börjar utan namn."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaxfel %s:%u: Felformat märke"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras på toppnivån"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaxfel %s:%u: Inkluderad härifrån"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut"
@@ -2222,7 +2259,7 @@ msgstr "Kunde inte ta status på monteringspunkten %s."
 
 # Felmeddelande för misslyckad chdir
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kunde inte byta till %s"
@@ -2256,146 +2293,156 @@ msgstr "Kunde inte erhålla låset %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Väntade på %s men den fanns inte där"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprocessen %s svarade med en felkod (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprocessen %s avslutades oväntat"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunde inte öppna filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problem med att stänga filen"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problem med att länka ut filen"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problem med att synkronisera filen"
 
 # Felmeddelande
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Paketcachen är tom"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Paketcachefilen är skadad"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Paketcachefilens version är inkompatibel"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denna APT saknar stöd för versionssystemet \"%s\""
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Paketcachen byggdes för en annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Beroende av"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Förberoende av"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Föreslår"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Rekommenderar"
 
 # "Konfliktar"?
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Står i konflikt med"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Ersätter"
 
 # "Föråldrar"?
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Föråldrar"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Trasar sönder"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "viktigt"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "nödvändigt"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "normalt"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Bygger beroendeträd"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Kandiderande versioner"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Beroendegenerering"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Läser tillståndsinformation"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Misslyckades med att öppna StateFile %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Misslyckades med att skriva temporär StateFile %s"
@@ -2484,7 +2531,7 @@ msgid ""
 msgstr ""
 "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2492,11 +2539,11 @@ msgstr ""
 "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
 "tillbakahållna paket."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kunde inte korrigera problemen, du har hållt tillbaka trasiga paket."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2504,24 +2551,24 @@ msgstr ""
 "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla "
 "använts istället."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Listkatalogen %spartial saknas."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Arkivkatalogen %spartial saknas."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Hämtar fil %li av %li (%s återstår)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Hämtar fil %li av %li"
@@ -2536,19 +2583,19 @@ msgstr "Metoddrivrutinen %s kunde inte hittas."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startade inte korrekt"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck på Enter."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketsystemet \"%s\" stöds inte"
 
 #
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunde inte fastställa en lämplig paketsystemstyp"
 
@@ -2570,16 +2617,18 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\""
 
 # "Package" är en sträng i konfigurationsfilen
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
-msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-huvud saknas"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-rubriken saknas"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Förstod inte nåltypen %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Prioritet ej angiven (eller noll) för nål"
 
@@ -2724,6 +2773,23 @@ msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s
 msgid "Size mismatch"
 msgstr "Storleken stämmer inte"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Kunde inte tolka paketfilen %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Observera, väljer %s istället för %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2782,6 +2848,12 @@ msgstr ""
 "Hittade %zu paketindex, %zu källkodsindex, %zu översättningsindex och %zu "
 "signaturer\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2812,22 +2884,22 @@ msgstr "Skriver ny källista\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Poster i källistan för denna skiva:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i saknade filer.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, 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"
@@ -2837,12 +2909,12 @@ msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n"
 msgid "Installing %s"
 msgstr "Installerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
@@ -2852,62 +2924,83 @@ msgstr "Tar bort %s"
 msgid "Running post-installation trigger %s"
 msgstr "Kör efterinstallationsutlösare %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Katalogen \"%s\" saknas"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Förbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Packar upp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Förbereder konfigurering av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Behandlar utlösare för %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Installerade %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Förbereder borttagning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Tog bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Förbereder borttagning av hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Tog bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kunde inte låsa listkatalogen"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Kunde inte lägga på programfix på filen"
@@ -2916,6 +3009,16 @@ msgstr "Kunde inte lägga på programfix på filen"
 msgid "Connection closed prematurely"
 msgstr "Anslutningen stängdes i förtid"
 
+# Prioritet följt av URI
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Behandlar utlösare för %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamisk MMap fick slut på utrymme"
+
 #~ 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"
diff --git a/po/th.po b/po/th.po
index 847f267dd..a6168da07 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2008-11-06 15:54+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -16,190 +16,149 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที่ต้องใช้:\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "จำนวนชื่อแพกเกจทั้งหมด : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  แพกเกจปกติ: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  แพกเกจเสมือนแท้ๆ: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  แพกเกจเสมือนที่มีแพกเกจจริงเดียว: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  แพกเกจเสมือนผสม: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  แพกเกจที่ขาดหาย: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "จำนวนรุ่นที่แตกต่างกันทั้งหมด: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "จำนวนคำบรรยายแพกเกจที่แตกต่างกันทั้งหมด: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "จำนวนการเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "จำนวนความสัมพันธ์ รุ่น/แฟ้ม ทั้งหมด: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "จำนวนความสัมพันธ์ คำบรรยาย/แฟ้ม ทั้งหมด: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "จำนวนผังการตระเตรียมทั้งหมด: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "จำนวนสตริงทั้งหมด: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "ขนาดของพื้นที่ความเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "พื้นที่สำรองทั้งหมด: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "พื้นที่ที่นับรวมทั้งหมด: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง"
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "คุณต้องระบุแพตเทิร์นด้วย"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "ไม่พบแพกเกจ"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "แฟ้มแพกเกจ:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ข้อมูลแคชไม่ตรงกับความเป็นจริงแล้ว ไม่สามารถอ้างอิงไขว้ระหว่างแฟ้มแพกเกจ"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "แพกเกจที่ถูกตรึง:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(ไม่พบ)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  ที่ติดตั้งอยู่: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(ไม่มี)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  รุ่นที่ติดตั้งได้: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  การตรึงแพกเกจ: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  ตารางรุ่น:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -680,79 +639,79 @@ msgstr "มีปัญหาขณะลบแฟ้ม %s"
 msgid "Failed to rename %s to %s"
 msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "แต่ไม่สามารถติดตั้งได้"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "แต่ได้ติดตั้งไว้"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " หรือ"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (เนื่องจาก %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -760,143 +719,143 @@ msgstr ""
 "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
 "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "ติดตั้งซ้ำ %lu, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ปรับรุ่นลง %lu, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " ล้มเหลว"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " เสร็จแล้ว"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "คุณอาจต้องเรียก `apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่ [y/N]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้"
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "แปลกประหลาด.. ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "ต้องดาวน์โหลดแพกเกจ %sB/%sB\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ต้องดาวน์โหลดแพกเกจ %sB\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "หลังจากการกระทำนี้ ต้องใช้เนื้อที่บนดิสก์อีก %sB\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย"
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -907,28 +866,28 @@ msgstr ""
 "หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "เลิกทำ"
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -936,47 +895,47 @@ msgstr ""
 "ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-"
 "missing อาจช่วยได้"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้"
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "จะล้มเลิกการติดตั้ง"
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "หมายเหตุ: จะเลือก %s แทน %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "แพกเกจ %s ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "แพกเกจ %s เป็นแพกเกจเสมือนที่ตระเตรียมโดย:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [ติดตั้งอยู่]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "คุณควรเจาะจงเลือกแพกเกจใดแพกเกจหนึ่งเพื่อติดตั้ง"
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -986,63 +945,68 @@ msgstr ""
 "ไม่มีแพกเกจ %s ให้ใช้ติดตั้ง แต่ถูกอ้างถึงโดยแพกเกจอื่น\n"
 "แพกเกจนี้อาจขาดหายไป หรือตกรุ่นไปแล้ว หรืออยู่ในแหล่งอื่น\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "อย่างไรก็ดี แพกเกจต่อไปนี้ได้แทนที่แพกเกจดังกล่าวไปแล้ว:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "แพกเกจ %s ไม่มีรุ่นที่จะใช้ติดตั้ง"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "ไม่พบรุ่น '%s' ของ '%s'"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้"
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1060,43 +1024,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "ไม่พบงาน %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1104,7 +1068,7 @@ msgstr ""
 "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
 "(หรือจะระบุทางแก้ก็ได้)"
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1115,122 +1079,122 @@ msgstr ""
 "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
 "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "แพกเกจมีปัญหา"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "แพกเกจที่แนะนำ:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "กำลังคำนวณการปรับรุ่น... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "ล้มเหลว"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "เสร็จแล้ว"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ดาวน์โหลดซอร์ส %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "คำสั่ง build '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "โพรเซสลูกล้มเหลว"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1239,30 +1203,31 @@ msgstr ""
 "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
 "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "มอดูลที่รองรับ:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1278,7 +1243,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1345,6 +1310,14 @@ msgstr ""
 "และ apt.conf(5)\n"
 "                       APT นี้มีพลังของ Super Cow\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "เจอ "
@@ -1573,9 +1546,9 @@ msgstr "พบแพกเกจที่เขียนทับโดยไม
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "ไม่สามารถอ่าน %s"
@@ -1803,7 +1776,7 @@ msgstr "หมดเวลารอเชื่อมต่อ"
 msgid "Server closed the connection"
 msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "การอ่านข้อมูลผิดพลาด"
 
@@ -1815,7 +1788,7 @@ msgstr "คำตอบท่วมบัฟเฟอร์"
 msgid "Protocol corruption"
 msgstr "มีความเสียหายของโพรโทคอล"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "การเขียนข้อมูลผิดพลาด"
 
@@ -1869,7 +1842,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก
 msgid "Unable to accept connection"
 msgstr "ไม่สามารถรับการเชื่อมต่อ"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
 
@@ -1953,38 +1926,38 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง
 msgid "Unable to connect to %s %s:"
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน"
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2000,80 +1973,80 @@ msgstr "ไม่สามารถเปิดไปป์สำหรับ %s
 msgid "Read error from %s process"
 msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "รอหัวข้อมูล"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเกิน %u อักขระ"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "select ไม่สำเร็จ"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "ไม่สามารถตัดท้ายแฟ้ม"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "ข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
@@ -2086,11 +2059,38 @@ msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "เนื้อที่สำหรับทำ MMap แบบพลวัตเต็มแล้ว"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "ไม่พบรายการเลือก %s"
@@ -2105,42 +2105,42 @@ msgstr "พบตัวย่อของชนิดที่ข้อมูล
 msgid "Opening configuration file %s"
 msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ"
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม"
@@ -2207,7 +2207,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "ไม่สามารถ stat จุดเมานท์ %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s"
@@ -2241,143 +2241,153 @@ msgstr "ไม่สามารถล็อค %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "ไม่สามารถเปิดแฟ้ม %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "เกิดปัญหาขณะปิดแฟ้ม"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "เกิดปัญหาขณะลบแฟ้ม"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "เกิดปัญหาขณะ sync แฟ้ม"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "แคชของแพกเกจว่างเปล่า"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "แฟ้มแคชของแพกเกจเสียหาย"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "ต้องใช้"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "ต้องใช้ขณะติดตั้ง"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "แนะนำ"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "ควรใช้ร่วมกับ"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "ขัดแย้งกับ"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "แทนที่"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "ใช้แทน"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "ทำให้พัง"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "สำคัญ"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "จำเป็น"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "มาตรฐาน"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "ตัวเลือก"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "ส่วนเสริม"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "รุ่นแพกเกจที่มี"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "สร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "กำลังอ่านข้อมูลสถานะ"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
@@ -2465,7 +2475,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ"
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2473,34 +2483,34 @@ msgstr ""
 "ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย "
 "อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้"
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน"
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial"
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li"
@@ -2515,17 +2525,17 @@ msgstr "ไม่พบไดรเวอร์สำหรับวิธีก
 msgid "Method %s did not start correctly"
 msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ไม่รองรับระบบแพกเกจ '%s'"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้"
 
@@ -2546,16 +2556,18 @@ msgstr "ไม่สามารถแจงหรือเปิดรายช
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง: ไม่มีข้อมูลส่วนหัว 'Package'"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "ไม่เข้าใจชนิดการตรึง %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
 
@@ -2693,6 +2705,23 @@ msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไ�
 msgid "Size mismatch"
 msgstr "ขนาดไม่ตรงกัน"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "หมายเหตุ: จะเลือก %s แทน %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2751,6 +2780,12 @@ msgstr ""
 "พบดัชนีแพกเกจ %zu รายการ, ดัชนีซอร์ส %zu รายการ, ดัชนีคำแปล %zu รายการ และลายเซ็น %"
 "zu รายการ\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2781,22 +2816,22 @@ msgstr "กำลังเขียนรายชื่อแหล่งแพ
 msgid "Source list entries for this disc are:\n"
 msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "เขียนแล้ว %i ระเบียน\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
@@ -2806,12 +2841,12 @@ msgstr "เขียนแล้ว %i ระเบียน โดยมีแ�
 msgid "Installing %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "กำลังตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "กำลังถอดถอน %s"
@@ -2821,63 +2856,84 @@ msgstr "กำลังถอดถอน %s"
 msgid "Running post-installation trigger %s"
 msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ไม่มีไดเรกทอรี '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "กำลังเตรียม %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "กำลังแตกแพกเกจ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "กำลังเตรียมตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "กำลังประมวลผลการสะกิดสำหรับ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "ติดตั้ง %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "กำลังเตรียมถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "ถอดถอน %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts "
 "หรือเปล่า?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "ไม่สามารถแพตช์แฟ้ม"
@@ -2886,6 +2942,15 @@ msgstr "ไม่สามารถแพตช์แฟ้ม"
 msgid "Connection closed prematurely"
 msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "กำลังประมวลผลการสะกิดสำหรับ %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "เนื้อที่สำหรับทำ MMap แบบพลวัตเต็มแล้ว"
+
 #~ 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"
diff --git a/po/tl.po b/po/tl.po
index 03c743225..497e9e649 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -19,192 +19,151 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Kabuuan ng mga Pakete : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Normal na Pakete: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Purong Birtwual na Pakete: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Nag-iisang Birtwal na Pakete: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Halong Birtwal na Pakete: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Kulang/Nawawala: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Kabuuan ng mga Dependensiya: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Kabuuan ng Mapping ng Provides: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Kabuuan ng Globbed String: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Kabuuan ng Hindi Nagamit na puwang: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Kabuuan ng puwang na napag-tuosan: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Wala sa sync ang talaksan ng paketeng %s."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Walang nahanap na mga pakete"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Talaksang Pakete:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Mga naka-Pin na Pakete:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(hindi nahanap)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Nakaluklok: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(wala)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Kandidato: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Naka-Pin na Pakete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Talaang Bersyon:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -698,79 +657,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:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "O"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error sa pag-compile ng regex - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "ngunit ang %s ay nakaluklok"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "ngunit hindi ito maaaring iluklok"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "ngunit ito ay birtwal na pakete"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "ngunit ito ay hindi nakaluklok"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "ngunit ito ay hindi iluluklok"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Ang susunod na mga pakete ay iu-upgrade:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (dahil sa %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -778,150 +737,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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu iniluklok muli, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nai-downgrade, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, 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:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Inaayos ang mga dependensiya..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " ay bigo."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Hindi maayos ang mga dependensiya"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Hindi mai-minimize ang upgrade set"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Tapos"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 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:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr ""
 "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 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:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Hindi maaldaba ang directory ng download"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibo.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %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:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Hindi matantsa ang libreng puwang sa %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Kulang kayo ng libreng puwang sa %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial."
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Oo, gawin ang sinasabi ko!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -932,28 +891,28 @@ msgstr ""
 "Upang magpatuloy, ibigay ang pariralang '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Abort."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Nais niyo bang magpatuloy [O/h]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Bigo sa pagkuha ng %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "May mga talaksang hindi nakuha"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -961,48 +920,48 @@ msgstr ""
 "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
 "subukang may --fix-missing?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Hindi maayos ang mga kulang na pakete."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Ina-abort ang pag-instol."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Paunawa, pinili ang %s imbes na %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Nakaluklok]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Dapat kayong mamili ng isa na iluluklok."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1013,64 +972,69 @@ msgstr ""
 "Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n"
 "sa ibang pinagmulan.\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' para sa '%s' ay hindi nahanap"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Hindi maaldaba ang directory ng talaan"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1086,46 +1050,46 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1133,7 +1097,7 @@ msgstr ""
 "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
 "mga pakete (o magtakda ng solusyon)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1144,115 +1108,115 @@ 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:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Sirang mga pakete"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Mga paketeng mungkahi:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Mga paketeng rekomendado:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Sinusuri ang pag-upgrade... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Bigo"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Tapos"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Hindi mahanap ang paketeng source para sa %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kulang kayo ng libreng puwang sa %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Kunin ang Source %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Bigo sa pagkuha ng ilang mga arkibo."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Utos na build '%s' ay bigo.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Bigo ang prosesong anak"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Walang build depends ang %s.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1261,7 +1225,7 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1270,32 +1234,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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Hindi mabuo ang build-dependencies para sa %s."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1312,7 +1276,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1378,6 +1342,14 @@ msgstr ""
 "para sa karagdagang impormasyon at mga option.\n"
 "                       Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Tumama "
@@ -1610,9 +1582,9 @@ msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Hindi mabasa ang %s"
@@ -1845,7 +1817,7 @@ msgstr "Lumipas ang koneksyon"
 msgid "Server closed the connection"
 msgstr "Sinarhan ng server ang koneksyon"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Error sa pagbasa"
 
@@ -1857,7 +1829,7 @@ msgstr "May sagot na bumubo sa buffer."
 msgid "Protocol corruption"
 msgstr "Sira ang protocol"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Error sa pagsulat"
 
@@ -1911,7 +1883,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:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 
@@ -1995,43 +1967,43 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Hindi maka-konekta sa %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Hindi mabasa ang keyring: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. "
 "Lalabas."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
 "fingerprint?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Hindi kilalang error sa pag-execute ng gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2049,81 +2021,81 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s"
 msgid "Read error from %s process"
 msgstr "Error sa pagbasa mula sa prosesong %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Naghihintay ng panimula"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Maling linyang panimula"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Sira ang range support ng HTTP server na ito"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Di kilalang anyo ng petsa"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Bigo ang pagpili"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Nag-timeout ang koneksyon"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Bigo sa pagsulat ng talaksang %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Maling datos sa panimula"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Internal na error"
 
@@ -2136,11 +2108,38 @@ msgstr "Hindi mai-mmap ang talaksang walang laman"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Hindi makagawa ng mmap ng %lu na byte"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Piniling %s ay hindi nahanap"
@@ -2155,43 +2154,43 @@ msgstr "Hindi kilalang katagang uri: '%c'"
 msgid "Opening configuration file %s"
 msgstr "Binubuksan ang talaksang pagsasaayos %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntax error %s:%u: Maling anyo ng Tag"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntax error %s:%u: May basura matapos ng halaga"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntax error %s:%u: Sinama mula dito"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan"
@@ -2260,7 +2259,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Di mai-stat ang mount point %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Di makalipat sa %s"
@@ -2297,144 +2296,154 @@ msgstr "hindi makuha ang aldaba %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Naghintay, para sa %s ngunit wala nito doon"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Naghudyat ang sub-process %s ng error code (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Problema sa pagsara ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Problema sa pag-unlink ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Problema sa pag-sync ng talaksan"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Walang laman ang cache ng pakete"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Sira ang talaksan ng cache ng pakete"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 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:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Dependensiya"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "PreDepends"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Mungkahi"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Rekomendado"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Tunggali"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Pumapalit"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Linalaos"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "kailangan"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Ginagawa ang puno ng mga dependensiya"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Bersyong Kandidato"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Pagbuo ng Dependensiya"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 #, fuzzy
 msgid "Reading state information"
 msgstr "Pinagsasama ang magagamit na impormasyon"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Bigo ang pagbukas ng %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Bigo sa pagsulat ng talaksang %s"
@@ -2524,7 +2533,7 @@ msgstr ""
 "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
 "para dito."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2532,12 +2541,12 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
 "ito ng mga paketeng naka-hold."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2545,24 +2554,24 @@ msgstr ""
 "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
 "mga luma na lamang."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Nawawala ang directory ng arkibo %spartial."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Kinukuha ang talaksang %li ng %li"
@@ -2577,18 +2586,18 @@ msgstr "Ang driver ng paraang %s ay hindi mahanap."
 msgid "Method %s did not start correctly"
 msgstr "Hindi umandar ng tama ang paraang %s"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
 
@@ -2612,16 +2621,18 @@ msgstr ""
 "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang "
 "ito"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Hindi naintindihan ang uri ng pin %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
 
@@ -2769,6 +2780,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Di tugmang laki"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Paunawa, pinili ang %s imbes na %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2828,6 +2856,12 @@ msgstr ""
 "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
 "signature\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
@@ -2858,22 +2892,22 @@ msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
 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/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Nagsulat ng %i na record.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2885,12 +2919,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Isasaayos ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Tinatanggal ang %s"
@@ -2900,61 +2934,82 @@ msgstr "Tinatanggal ang %s"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Hinahanda ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Binubuklat ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Hinahanda ang %s upang isaayos"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "Error sa pagproseso ng directory %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Naghahanda para sa pagtanggal ng %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Tinanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Hindi maaldaba ang directory ng talaan"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Hindi mai-patch ang talaksan"
@@ -2963,6 +3018,13 @@ msgstr "Hindi mai-patch ang talaksan"
 msgid "Connection closed prematurely"
 msgstr "Nagsara ng maaga ang koneksyon"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Error sa pagproseso ng directory %s"
+
 #~ 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"
diff --git a/po/uk.po b/po/uk.po
index ca4b25db0..e7615d901 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-all\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
 "PO-Revision-Date: 2006-07-29 15:57+0300\n"
 "Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"
@@ -15,192 +15,151 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Не можу знайти пакунок %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Всього імен пакунків : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Нормальних пакунків: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Чисто віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Окремих віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr " Змішаних віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Пропущено: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Всього унікальних версій: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Всього унікальних версій: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Всього залежностей: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Всього відносин Версія/Файл: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Всього відносин Версія/Файл: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Всього відносин Provides: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Всього розгорнутих рядків: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "Всього інформації про залежності: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Порожнього місця в кеші: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Загальний простір полічений для: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Перелік пакунків %s розсинхронізований."
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Ви повинні задати рівно один шаблон"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Не знайдено жодного пакунка"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Переліки пакунків:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Зафіксовані пакунки:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(не знайдено)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Встановлено: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(відсутній)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Фіксатор(pin) пакунка: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Таблиця версій:"
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s для %s %s скомпільовано %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -696,79 +655,79 @@ msgstr "Не вдалося видалити %s"
 msgid "Failed to rename %s to %s"
 msgstr "Не вдалося перейменувати %s в %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Т"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Помилка компіляції регулярного виразу - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "Пакунки, що мають незадоволені залежності:"
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "але %s вже встановлений"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "але %s буде встановлений"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "але він не може бути встановлений"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "але це віртуальний пакунок"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "але він не встановлений"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "але він не буде встановлений"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " чи"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "НОВІ пакунки, які будуть встановлені:"
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Пакунки, які будуть залишені в незмінному вигляді:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Пакунки, будуть замінені на більш СТАРІ версії:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Пакунки, які повинні були б залишитися без змін, але будуть замінені:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (внаслідок %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -776,150 +735,150 @@ msgstr ""
 "УВАГА: Ці істотно важливі пакунки будуть вилучені.\n"
 "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "оновлено %lu, встановлено %lu нових пакунків, "
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr " %lu перевстановлено, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu пакунків замінено на старі версії, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "для видалення відмічено %lu пакунків, і %lu пакунків не оновлено.\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "не встановлено до кінця чи видалено %lu пакунків.\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Виправлення залежностей..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " невдача."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Неможливо скоригувати залежності"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "Неможливо мінімізувати набір оновлень"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Виконано"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 "Можливо, для виправлення цих помилок ви захочете скористатися 'apt-get -f "
 "install'."
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "Незадоволені залежності. Спробуйте використати -f."
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Автентифікаційне попередження не прийнято до уваги.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "Встановити ці пакунки без перевірки [т/Н]? "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "Деякі пакунки неможливо автентифікувати"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Існують проблеми, а опція -y використана без --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Внутрішня помилка, InstallPackages була викликана з непрацездатними "
 "пакунками!"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Пакунки необхідно видалити, але видалення заборонене."
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутрішня помилка, Ordering не завершилася"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Неможливо заблокувати теку для завантаження"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Неможливо прочитати перелік джерел."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Дивно.. Розбіжність розмірів, напишіть на apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Необхідно завантажити %sB/%sB архівів.\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Необхідно завантажити %sB архівів.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Після розпакування об'єм зайнятого дискового простору зросте на %sB.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не вдалося визначити кількість вільного місця в %s"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Недостатньо вільного місця в %s."
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Запитане виконання тільки тривіальних операцій, але це не тривіальна "
 "операція."
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Так, робити, як я скажу!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -930,28 +889,28 @@ msgstr ""
 "Щоб продовжити, введіть фразу: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Перервано."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "Бажаєте продовжити [Т/н]? "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не вдалося завантажити %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Деякі файли не вдалося завантажити"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -959,49 +918,49 @@ msgstr ""
 "Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update "
 "або спробувати повторити запуск з ключем --fix-missing?"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing і зміна носія в даний момент не підтримується"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Неможливо виправити втрачені пакунки."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Переривається встановлення."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Помітьте, замість %2$s вибирається %1$s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Пропускається %s - пакунок вже встановлений, і опція upgrade не "
 "встановлена.\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Пакунок %s не встановлений, тому не може бути видалений\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Пакунок %s - віртуальний, його функції надаються пакунками:\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Встановлено]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "Ви повинні явно вказати, який саме ви хочете встановити."
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1013,64 +972,69 @@ msgstr ""
 "Це може означати, що пакунок відсутній, застарів, або доступний з джерел, не "
 "згаданих в sources.list\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Однак наступні пакунки можуть його замінити:"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Для пакунка %s не знайдені кандидати на встановлення"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Вже встановлена найновіша версія %s.\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Реліз '%s' для '%s' не знайдений"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Версія '%s' для '%s' не знайдена"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Обрана версія %s (%s) для %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "Команді update не потрібні аргументи"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Неможливо заблокувати теку з переліками пакунків"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Використовуйте 'apt-get autoremove' щоб видалити їх."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1088,46 +1052,46 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "Наступна інформація можливо допоможе Вам:"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем все поламав"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутрішня помилка, AllUpgrade все поламав"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Не можу знайти пакунок %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не можу знайти пакунок %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "але %s буде встановлений"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
 "install':"
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1135,7 +1099,7 @@ msgstr ""
 "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
 "вказуючи імені пакунка (або знайдіть інше рішення)."
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1146,121 +1110,121 @@ msgstr ""
 "або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n"
 "ще не створені або були вилучені з Incoming."
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Зламані пакунки"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "Будуть встановлені наступні додаткові пакунки:"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Пропоновані пакунки:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Рекомендовані пакунки:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Обчислення оновлень... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Невдача"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Виконано"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем все поламав"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
 "тексти"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаємо вже завантажений файл '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостатньо місця в %s"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Завантаження вихідних текстів %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Деякі архіви не вдалося завантажити."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
 "розпаковані вихідні тексти\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда розпакування '%s' завершилася невдало.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда побудови '%s' закінчилася невдало.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Породжений процес завершився невдало"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для перевірки залежностей для побудови необхідно вказати як мінімум один "
 "пакунок"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Неможливо одержати інформацію про залежності для побудови %s"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не має залежностей для побудови.\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1268,7 +1232,7 @@ msgid ""
 msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1277,32 +1241,32 @@ msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо ні одна з версій "
 "пакунка %s не задовольняє умови"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
 "пакунок %s новіше, аніж треба"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Залежності для побудови %s не можуть бути задоволені."
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "Обробка залежностей для побудови закінчилася невдало"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Підтримувані модулі:"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1319,7 +1283,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1389,6 +1353,14 @@ msgstr ""
 "містять більше інформації.\n"
 "                       This APT has Super Cow Powers.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "В кеші "
@@ -1623,9 +1595,9 @@ msgstr "Файли заміняються вмістом пакета %s без
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Файл %s/%s перезаписує інший з пакету %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Неможливо прочитати %s"
@@ -1860,7 +1832,7 @@ msgstr "Час з'єднання вичерпався"
 msgid "Server closed the connection"
 msgstr "Сервер закрив з'єднання"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Помилка читання"
 
@@ -1872,7 +1844,7 @@ msgstr "Відповідь переповнила буфер."
 msgid "Protocol corruption"
 msgstr "Спотворений протокол"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Помилка запису"
 
@@ -1928,7 +1900,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс
 msgid "Unable to accept connection"
 msgstr "Неможливо прийняти з'єднання"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Проблема хешування файла"
 
@@ -2012,41 +1984,41 @@ msgstr "Сталося щось дивне при спробі отримати
 msgid "Unable to connect to %s %s:"
 msgstr "Не можливо під'єднатися до %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Неможливо отримати доступ до keyring: '%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
 "відбиток?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Знайдено як мінімум один невірний підпис."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Невідома помилка виконання gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Слідуючі підписи були невірними:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2064,83 +2036,83 @@ msgstr "Неможливо відкрити канал (pipe) для %s"
 msgid "Read error from %s process"
 msgstr "Помилка читання з процесу %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Очікування на заголовки"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Отримано одну заголовкову лінію понад %u символів"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Невірна лінія заголовку"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP сервер відіслав невірний заголовок 'reply'"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "Цей HTTP сервер має поламану підтримку 'range'"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Невідомий формат дати"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Вибір не вдався"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Час очікування з'єднання вийшов"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Помилка запису в вихідний файл"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 #, fuzzy
 msgid "Error writing to file"
 msgstr "Помилка запису в файл"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 #, fuzzy
 msgid "Error writing to the file"
 msgstr "Помилка запису в файл"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Помилка читання з сервера"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Не вдалося записати файл %s"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Погана заголовкова інформація"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "З'єднання не вдалося"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
@@ -2153,11 +2125,38 @@ msgstr "Неможливо відобразити в пам'яті пустий
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Неможливо відобразити в пам'яті %lu байт"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Вибір %s не знайдено"
@@ -2172,44 +2171,44 @@ msgstr "Нерозпізнаваний тип абревіатури: '%c'"
 msgid "Opening configuration file %s"
 msgstr "Відкривається конфігураційний файл %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Синтаксова помилка  %s:%u: Блок починається без назви."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Синтаксова помилка %s:%u: спотворений тег"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Синтаксова помилка %s:%u: зайві символи після величини"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Синтаксова помилка  %s:%u: Директиви можуть бути виконані тільки на "
 "найвищому рівні"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Синтаксова помилка  %s:%u: Забагато вмонтованих включень"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Синтаксова помилка %s:%u: Включена звідси"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Синтаксова помилка  %s:%u: Директива '%s' не підтримується"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Синтаксова помилка %s:%u: зайві символи в кінці файла"
@@ -2276,7 +2275,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Неможливо прочитати атрибути точки монтування %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Неможливо зробити зміни у %s"
@@ -2314,145 +2313,155 @@ msgstr "Не можливо отримати lock %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Очікується на %s але його тут немає"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Підпроцес %s отримав segmentation fault."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Підпроцес %s отримав segmentation fault."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Підпроцес %s повернув код помилки (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Підпроцес %s раптово завершився"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Не можливо відкрити файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 "помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Проблема з закриттям файла"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Проблема з роз'єднанням файла"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Проблема з синхронізацією файла"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Кеш пакунків пустий"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Файл кешу пакунків пошкоджений"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "Файл кешу пакунків має несумісну версію"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT не підтримує систему призначення версій '%s'"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "Кеш пакунків був побудований для іншої архітектури"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Залежності (Depends)"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Пре-Залежності (PreDepends)"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Пропонує (Suggests)"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Рекомендує"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Конфлікти"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Заміняє (Replaces)"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Застарілі (Obsoletes)"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "Важливі (Important)"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "Необхідні (Required)"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "Стандартні (Standard)"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "Необов'язкові (Optional)"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "Додаткові (Extra)"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Побудова дерева залежностей"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Версії кандидатів"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Ґенерація залежностей"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 #, fuzzy
 msgid "Reading state information"
 msgstr "Об'єднання інформації про доступні пакунки"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Не вдалося відкрити %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Не вдалося записати файл %s"
@@ -2543,7 +2552,7 @@ msgstr ""
 "Пакунок %s повинен бути перевстановленим, але я не можу знайти архіву для "
 "нього."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2551,11 +2560,11 @@ msgstr ""
 "Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути "
 "пов'язано з зафіксованими пакунками."
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Неможливо усунути проблеми, Ви маєте поламані зафіксовані пакунки."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2563,24 +2572,24 @@ msgstr ""
 "Деякі індексні файли не завантажилися, вони були зігноровані або замість них "
 "були використані старі версії."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Lists тека %spartial відсутня."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Архівна тека %spartial відсутня."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Завантажується файл %li з %li (%s залишилось)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Завантажується файл %li з %li"
@@ -2595,18 +2604,18 @@ msgstr "Драйвер для метода %s не знайдено."
 msgid "Method %s did not start correctly"
 msgstr "Метод %s не стартував коректно"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Будь-ласка, вставте диск з поміткою: '%s' в CD привід '%s' і натисніть Enter."
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Система пакування '%s' не підтримується"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Неможливо визначити тип необхідної системи пакування "
 
@@ -2627,16 +2636,18 @@ msgstr "Не можу обробити чи відкрити перелік па
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Невірний запис в preferences файлі, відсутній заголовок Package"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Не зрозумів тип %s для pin"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Не встановлено пріоритету (або встановлено 0) для pin"
 
@@ -2783,6 +2794,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Невідповідність розміру"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Неможливо обробити файл %s пакунку (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Помітьте, замість %2$s вибирається %1$s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2840,6 +2868,12 @@ msgid ""
 "zu signatures\n"
 msgstr "Знайдено %i індексів пакунків, %i індексів джерел і %i підписів\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
@@ -2870,22 +2904,22 @@ msgstr "Записується новий перелік джерел\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Перелік джерел для цього диску:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Записано %i записів.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Записано %i записів з %i відсутніми файлами.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Записано %i записів з %i невідповідними файлам\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n"
@@ -2895,12 +2929,12 @@ msgstr "Записано %i записів з %i відсутніми і %i не
 msgid "Installing %s"
 msgstr "Встановлено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Конфігурація %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Видаляється %s"
@@ -2910,62 +2944,83 @@ msgstr "Видаляється %s"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Lists тека %spartial відсутня."
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Підготовка %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Розпакування %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Підготовка до конфігурації %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "Помилка обробки течи %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Встановлено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Підготовка до видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Підготовка до повного видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Повністю видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Неможливо записати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Неможливо заблокувати теку з переліками пакунків"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Неможливо накласти латку на файл"
@@ -2974,6 +3029,13 @@ msgstr "Неможливо накласти латку на файл"
 msgid "Connection closed prematurely"
 msgstr "З'єднання завершено передчасно"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Помилка обробки течи %s"
+
 #~ 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"
diff --git a/po/vi.po b/po/vi.po
index 3ed56e592..d7ad1cfdd 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,203 +6,160 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-09-05 17:03+0930\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2008-12-22 19:04+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b3\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
-#: cmdline/apt-cache.cc:143
+#: 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Không thể định vị gói %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "Tổng số tên gói: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  Gói chuẩn: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  Gói ảo nguyên chất: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  Gói ảo đơn: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  Gói ảo hỗn hợp: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  Thiếu : "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "Tổng phiên bản riêng: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "Tổng mô tả riêng: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "Tổng đồ phụ thuộc: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "Tổng liên quan phiên bản và tập tin: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "Tổng liên quan mô tả/tập tin: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "Tổng ảnh xạ Miễn là: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: "
 
-#: cmdline/apt-cache.cc:330
+#: 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:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Tổng chỗ nghỉ: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "Tổng chỗ đã tính: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, 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:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "Bạn phải đưa ra đúng một mẫu"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "Không tìm thấy gói"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "Tập tin gói:"
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 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:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "Các gói đã ghim:"
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(không tìm thấy)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  Đã cài đặt: "
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(không có)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  Ứng cử: "
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  Ghim gói: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  Bảng phiên bản:"
 
 # Variable: do not translate/ biến: đừng dịch
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s cho %s được biên dịch trên %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
-#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -240,7 +197,7 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
-"Cách sử dụng: apt-cache [tùy_chọn...] lệnh\n"
+"Sử dụng: apt-cache [tùy_chọn...] lệnh\n"
 "       apt-cache [tùy_chọn...] add tập_tin1 [tập_tin2 ...]\n"
 "       apt-cache [tùy_chọn...] showpkg gói1 [gói2 ...]\n"
 "       apt-cache [tùy_chọn...] showsrc gói1 [gói2 ...]\n"
@@ -280,7 +237,7 @@ msgstr ""
 "\t\t\tcho lệnh chưa thực hiện.\n"
 "  -c=? \t\tĐọc tập tin _cấu hình_ này\n"
 "  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
-"Để tìm thông tin thêm thì bạn hãy xem hai trang « man » (hướng dẫn)\n"
+"Để tìm thông tin thêm, xem hai trang « man » (hướng dẫn)\n"
 "\t\t\tapt-cache(8) và apt.conf(5).\n"
 
 #: cmdline/apt-cdrom.cc:78
@@ -717,79 +674,79 @@ msgstr "Gặp lỗi khi bỏ liên kết %s"
 msgid "Failed to rename %s to %s"
 msgstr "Việc đổi tên %s thành %s bị lỗi"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "C"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, 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:241
+#: cmdline/apt-get.cc:244
 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:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "nhưng mà %s đã được cài đặt"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "nhưng mà %s sẽ được cài đặt"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "nhưng mà nó không có khả năng cài đặt"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "nhưng mà nó là gói ảo"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "nhưng mà nó chưa được cài đặt"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 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:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " hay"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 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:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "Theo đây có những gói sẽ bị GỠ BỎ :"
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "Theo đây có những gói đã được giữ lại:"
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 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:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Theo đây có những gói sẽ được HẠ CẤP:"
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "Theo đây có những gói sẽ được thay đổi:"
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (do %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -797,147 +754,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:581
+#: cmdline/apt-get.cc:584
 #, 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:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu được cài đặt lại, "
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu được hạ cấp, "
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, 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:593
+#: cmdline/apt-get.cc:596
 #, 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:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "Đang sửa cách phụ thuộc..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " đã thất bại."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "Không thể sửa cách phụ thuộc"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 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:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " Đã xong"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 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:685
+#: cmdline/apt-get.cc:688
 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:707
+#: cmdline/apt-get.cc:710
 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:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "Cảnh báo xác thực bị đè.\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 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:720
+#: cmdline/apt-get.cc:723
 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:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 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:773
+#: cmdline/apt-get.cc:776
 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:782
+#: cmdline/apt-get.cc:785
 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:793
+#: cmdline/apt-get.cc:796
 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:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "Không thể khóa thư mục tải về"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Không thể đọc danh sách nguồn."
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 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:839
+#: cmdline/apt-get.cc:842
 #, 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:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Cần phải lấy %sB kho.\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, 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:871
+#: cmdline/apt-get.cc:874
 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 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:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Có, làm đi."
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -948,28 +905,28 @@ msgstr ""
 "Để tiếp tục thì hãy gõ cụm từ « %s »\n"
 "?]"
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "Hủy bỏ."
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 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:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Việc gói %s bị lỗi  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "Một số tập tin không tải về được"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 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:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -977,49 +934,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:1013
+#: cmdline/apt-get.cc:1016
 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:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "Không thể sửa những gói còn thiếu."
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "Đang hủy bỏ cài đặt."
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, 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:1063
+#: cmdline/apt-get.cc:1066
 #, 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:1081
+#: cmdline/apt-get.cc:1084
 #, 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:1092
+#: cmdline/apt-get.cc:1095
 #, 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:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [Đã cài đặt]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 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:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -1030,64 +987,69 @@ 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:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "Tuy nhiên, những gói theo đây thay thế nó :"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, 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:1156
+#: cmdline/apt-get.cc:1159
 #, 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:1164
+#: cmdline/apt-get.cc:1167
 #, 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:1193
+#: cmdline/apt-get.cc:1196
 #, 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:1195
+#: cmdline/apt-get.cc:1198
 #, 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:1201
+#: cmdline/apt-get.cc:1204
 #, 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:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 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:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "Không thể khóa thư mục danh sách"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng."
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1105,43 +1067,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 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:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì."
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 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:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Không tìm thấy tác vụ %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Không tìm thấy gói %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, 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:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 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:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1149,7 +1111,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:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1161,123 +1123,123 @@ 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:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "Gói bị ngắt"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 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:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "Gói được đệ nghị:"
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "Gói được khuyên:"
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "Đang tính nâng cấp... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "Bị lỗi"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "Xong"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 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:2068
+#: cmdline/apt-get.cc:2079
 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:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, 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:2147
+#: cmdline/apt-get.cc:2158
 #, 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:2175
+#: cmdline/apt-get.cc:2186
 #, 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:2181
+#: cmdline/apt-get.cc:2192
 #, 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:2184
+#: cmdline/apt-get.cc:2195
 #, 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:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Lấy nguồn %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "Việc lấy một số kho bị lỗi."
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, 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:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Lệnh giải nén « %s » bị lỗi.\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, 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:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "Tiến trình con bị lỗi"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 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:2342
+#: cmdline/apt-get.cc:2353
 #, 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:2362
+#: cmdline/apt-get.cc:2373
 #, 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:2414
+#: cmdline/apt-get.cc:2425
 #, 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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1286,31 +1248,32 @@ 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:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, 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:2542
+#: cmdline/apt-get.cc:2555
 #, 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:2546
+#: cmdline/apt-get.cc:2559
 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:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "Mô-đun đã hỗ trợ :"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1326,7 +1289,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1401,6 +1364,14 @@ msgstr ""
 "sources.list(5) và apt.conf(5).\n"
 "                       Trình APT này có năng lực của siêu bò.\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Lần tìm "
@@ -1635,9 +1606,9 @@ msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "Không thể đọc %s"
@@ -1873,7 +1844,7 @@ msgstr "Thời hạn kết nối"
 msgid "Server closed the connection"
 msgstr "Máy phục vụ đã đóng kết nối"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lỗi đọc"
 
@@ -1885,7 +1856,7 @@ msgstr "Một trả lời đã tràn bộ đệm."
 msgid "Protocol corruption"
 msgstr "Giao thức bị hỏng"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Lỗi ghi"
 
@@ -1939,7 +1910,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ"
 msgid "Unable to accept connection"
 msgstr "Không thể chấp nhận kết nối"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Gặp khó khăn băm tập tin"
 
@@ -2023,39 +1994,39 @@ msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "Không thể kết nối đến %s %s:"
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Không thể truy cập vòng khoá « %s »"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "Gặp ít nhất một chữ ký không hợp lệ."
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 "Không thể thực hiện « %s » để kiểm chứng chữ ký (gpgv có được cài đặt chưa?)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "Gặp lỗi lạ khi thực hiện gpgv"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "Những chữ ký theo đây là không hợp lệ:\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2072,85 +2043,84 @@ msgstr "Không thể mở ống dẫn cho %s"
 msgid "Read error from %s process"
 msgstr "Gặp lỗi đọc từ tiến trình %s"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "Đang đợi những phần đầu..."
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, 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:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "Dòng đầu sai"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 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:586
+#: methods/http.cc:588
 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:601
+#: methods/http.cc:603
 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:603
+#: methods/http.cc:605
 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:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "Không biết dạng ngày"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "Việc chọn bị lỗi"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "Kết nối đã quá giờ"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "Gặp lỗi khi ghi vào tập tin xuất"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "Gặp lỗi khi ghi vào tập tin đó"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 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:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
-#, fuzzy
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
-msgstr "Việc ghi tập tin %s bị lỗi"
+msgstr "Lỗi cắt ngắn tập tin"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "Dữ liệu dòng đầu sai"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "Kết nối bị ngắt"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 
@@ -2163,11 +2133,38 @@ msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "Không tìm thấy vùng chọn %s"
@@ -2182,42 +2179,42 @@ msgstr "Không nhận biết viết tắt kiểu: « %c »"
 msgid "Opening configuration file %s"
 msgstr "Đang mở tập tin cấu hình %s..."
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên."
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin"
@@ -2284,7 +2281,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "Không thể lấy các thông tin cho điểm gắn kết %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Không thể chuyển đổi sang %s"
@@ -2318,143 +2315,153 @@ msgstr "Không thể lấy khóa %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "Đã đợi %s nhưng mà chưa gặp nó"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn."
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn."
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Tiến trình con %s đã thoát bất ngờ"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "Không thể mở tập tin %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "ghi, còn cần ghi %lu nhưng mà không thể"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "Gặp lỗi khi đóng tập tin đó"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "Gặp lỗi khi bỏ liên kết tập tin đó"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "Bộ nhớ tạm gói rỗng"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "Tập tin bộ nhớ tạm gói bị hỏng"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 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:148
+#: apt-pkg/pkgcache.cc:149
 #, 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:153
+#: apt-pkg/pkgcache.cc:154
 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:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "Phụ thuộc"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "Phụ thuộc trước"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "Đệ nghị"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "Khuyên"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "Xung đột"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "Thay thế"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "Làm cũ"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "Làm hư"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "quan trọng"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "cần"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "chuẩn"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "tùy chọn"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "thêm"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "Đang xây dụng cây cách phụ thuộc..."
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "Phiên bản ứng cử"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "Tạo ra cách phụ thuộc"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "Đang đọc thông tin tình trạng"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Lỗi mở tập tin tình trạng StateFile %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Lỗi ghi tập tin tình trạng StateFile tạm thời %s"
@@ -2545,7 +2552,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó."
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2553,11 +2560,11 @@ 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:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt."
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2565,24 +2572,24 @@ 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ế."
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Thiếu thư mục danh sách « %spartial »."
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Thiếu thư mục kho « %spartial »."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Đang lấy tập tin %li trên %li (%s còn lại)..."
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Đang lấy tập tin %li trên %li..."
@@ -2597,17 +2604,17 @@ msgstr "Không tìm thấy trình điều khiển phương pháp %s."
 msgid "Method %s did not start correctly"
 msgstr "Phương pháp %s đã không bắt đầu cho đúng."
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
 
-#: apt-pkg/init.cc:124
+#: 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:140
+#: 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"
 
@@ -2630,18 +2637,20 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package "
 "(Gói)."
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Không hiểu kiểu ghim %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
 
@@ -2787,6 +2796,23 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Kích cỡ không khớp được"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "Không thể phân tách tập tin gói %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "Ghi chú : đang chọn %s thay vì %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2844,6 +2870,12 @@ msgid ""
 msgstr ""
 "Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2874,22 +2906,22 @@ msgstr "Đang ghi danh sách nguồn mới...\n"
 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/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Mới ghi %i mục ghi.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, 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:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, 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:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2901,12 +2933,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Đang cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "Đang cấu hình %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "Đang gỡ bỏ %s..."
@@ -2916,61 +2948,82 @@ msgstr "Đang gỡ bỏ %s..."
 msgid "Running post-installation trigger %s"
 msgstr "Đang chạy bộ gây nên tiến trình cuối cùng cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Thiếu thư mục « %s »"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "Đang chuẩn bị %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "Đang mở gói %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Đang chuẩn bị cấu hình %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Đang xử lý các bộ gây nên cho %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "Đã cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Đang chuẩn bị gỡ bỏ %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "Đã gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "Mới gỡ bỏ hoàn toàn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Không thể ghi lưu, openpty() bị lỗi (« /dev/pts » chưa lắp ?)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Không thể khóa thư mục danh sách"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Không thể vá lỗi trong tập tin %s"
@@ -2979,6 +3032,16 @@ msgstr "Không thể vá lỗi trong tập tin %s"
 msgid "Connection closed prematurely"
 msgstr "Kết nối bị đóng quá sớm."
 
+# Variable: do not translate/ biến: đừng dịch
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Đang xử lý các bộ gây nên cho %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Hết chỗ tạo sơ đồ bộ nhớ động (Dynamic MMap)"
+
 #~ 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"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b2b2468f7..4411aaf92 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,161 +8,156 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-15 00:49+0800\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-06-01 15:54+0800\n"
 "Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "未发现软件包 %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
 msgstr "软件包名称总数："
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "  普通软件包："
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "  完全虚拟软件包："
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
 msgstr "  单虚拟软件包："
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  混合虚拟软件包："
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "  缺漏的："
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
 msgstr "按版本共计："
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
 msgstr "按不同的说明共计："
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
 msgstr "按依赖关系共计："
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
 msgstr "按版本/文件关系共计："
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
 msgstr "按说明/文件关系共计："
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
 msgstr "提供映射共计："
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
 msgstr "Glob 字串共计："
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
 msgstr "依赖关系版本名所占空间共计："
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
 msgstr "Slack 空间共计："
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
 msgstr "总占用空间："
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步(sync)。"
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
 msgstr "您必须明确地给出一个表达式"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "没有发现吻合的软件包"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "软件包文件："
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件"
 
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "被锁定(pinned)的软件包："
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(没有找到)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "  已安装："
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(无)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
 msgstr "  候选的软件包："
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "  软件包锁(Pin)："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s 编译于 %s %s\n"
 
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -647,79 +642,79 @@ msgstr "在 unlink %s 时出错"
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "下列的软件包有不能满足的依赖关系："
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "但是 %s 已经安装了"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是 %s 正要被安装"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "但却无法安装它"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "但是它只是个虚拟软件包"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "但是它还没有被安装"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "但是它将不会被安装"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr " 或"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】软件包将被安装："
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "下列软件包将被【卸载】："
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "下列的软件包的版本将保持不变："
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "下列的软件包将被升级："
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列软件包将被【降级】："
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "下列被要求保持版本不变的软件包将被改变："
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -727,143 +722,143 @@ msgstr ""
 "【警告】：下列的基础软件包将被卸载。\n"
 "请勿尝试，除非您确实知道您在做什么！"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "共重新安装了 %lu 个软件包，"
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "降级了 %lu 个软件包，"
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
 msgstr "正在更正依赖关系..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
 msgstr " 失败。"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
 msgstr "无法更正依赖关系"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
 msgstr "无法最小化要升级的软件包集合"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " 完成"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
 msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "【警告】：下列的软件包不能通过验证！"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了认证警告。\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
 msgstr "不经验证就安装这些软件包么？[y/N] "
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
 msgstr "有些软件包不能通过验证"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
 msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 未能完成"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
 msgstr "无法对下载目录加锁"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "无法读取安装源列表。"
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下载 %sB/%sB 的软件包。\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下载 %sB 的软件包。\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的空余空间"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "您在 %s 中没有足够的空余空间。"
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -874,28 +869,28 @@ msgstr ""
 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "中止执行。"
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
 msgstr "有一些文件下载失败"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -903,47 +898,47 @@ msgstr ""
 "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
 "再试试？"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
 msgstr "无法更正缺少的软件包。"
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "放弃安装。"
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "注意，选取 %s 而非 %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr " [已安装]"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "请您明确地选择一个来进行安装。"
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -954,63 +949,68 @@ msgstr ""
 "这可能意味着这个缺失的软件包可能已被废弃，\n"
 "或者只能在其他发布源中找到\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
 msgstr "可是下列的软件包取代了它："
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "软件包 %s 还没有可供安装的候选者"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "不能重新安装 %s，因为无法下载它。\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 已经是最新的版本了。\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”发布版本"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "选定了版本为 %s (%s) 的 %s\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr " update 命令是不需任何参数的"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "无法对状态列表目录加锁"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我们不应该进行删除，无法启动自动删除器"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "下列软件包是自动安装的并且现在不再被使用了："
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "使用'apt-get autoremove'来删除它们"
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1026,43 +1026,43 @@ msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
 msgstr "下列的信息可能会对解决问题有所帮助："
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动删除器坏事了"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部错误，全部升级坏事了"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "无法找到任务 %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1070,7 +1070,7 @@ msgstr ""
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 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"
@@ -1081,122 +1081,122 @@ msgstr ""
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们还在新到(incoming)目录中。"
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "无法安装的软件包"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
 msgstr "正在筹划升级... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "失败"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决器坏事了"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的空余空间"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "子进程出错"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, 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:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1205,30 +1205,72 @@ msgstr ""
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
 "$s 依赖关系"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, 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:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
 msgstr "被支持模块："
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
+#| msgid ""
+#| "Usage: apt-get [options] command\n"
+#| "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+#| "       apt-get [options] source pkg1 [pkg2 ...]\n"
+#| "\n"
+#| "apt-get is a simple command line interface for downloading and\n"
+#| "installing packages. The most frequently used commands are update\n"
+#| "and install.\n"
+#| "\n"
+#| "Commands:\n"
+#| "   update - Retrieve new lists of packages\n"
+#| "   upgrade - Perform an upgrade\n"
+#| "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+#| "   remove - Remove packages\n"
+#| "   autoremove - Remove automatically all unused packages\n"
+#| "   purge - Remove and purge packages\n"
+#| "   source - Download source archives\n"
+#| "   build-dep - Configure build-dependencies for source packages\n"
+#| "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+#| "   dselect-upgrade - Follow dselect selections\n"
+#| "   clean - Erase downloaded archive files\n"
+#| "   autoclean - Erase old downloaded archive files\n"
+#| "   check - Verify that there are no broken dependencies\n"
+#| "\n"
+#| "Options:\n"
+#| "  -h  This help text.\n"
+#| "  -q  Loggable output - no progress indicator\n"
+#| "  -qq No output except for errors\n"
+#| "  -d  Download only - do NOT install or unpack archives\n"
+#| "  -s  No-act. Perform ordering simulation\n"
+#| "  -y  Assume Yes to all queries and do not prompt\n"
+#| "  -f  Attempt to correct a system with broken dependencies in place\n"
+#| "  -m  Attempt to continue if archives are unlocatable\n"
+#| "  -u  Show a list of upgraded packages as well\n"
+#| "  -b  Build the source package after fetching it\n"
+#| "  -V  Show verbose version numbers\n"
+#| "  -c=? Read this configuration file\n"
+#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+#| "pages for more information and options.\n"
+#| "                       This APT has Super Cow Powers.\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1244,7 +1286,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1311,6 +1353,14 @@ msgstr ""
 "以获取更多信息和选项。\n"
 "                       本 APT 有着超级牛力。\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "命中 "
@@ -1539,9 +1589,9 @@ msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
@@ -1771,7 +1821,7 @@ msgstr "连接超时"
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
 msgstr "读错误"
 
@@ -1783,7 +1833,7 @@ msgstr "回应超出了缓存区大小。"
 msgid "Protocol corruption"
 msgstr "协议有误"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
 msgstr "写文件出错"
 
@@ -1837,7 +1887,7 @@ msgstr "数据套接字连接超时"
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 
@@ -1921,38 +1971,38 @@ msgstr "解析“%s:%s”时，出现了某些故障 (%i)"
 msgid "Unable to connect to %s %s:"
 msgstr "不能连接上 %s %s："
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "无法访问密匙：“%s”"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr "无法运行\"%s\"以验证签名(您安装了 gpgv 么？)"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr "运行 gpgv 时发生未知错误"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1968,80 +2018,80 @@ msgstr "无法为 %s 开启管道"
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr "错误的报头条目"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 http 服务器发送了一个无效的应答报头"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr "该 http 服务器的 range 支持不正常"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
 msgstr "select 调用出错"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "连接服务器超时"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
 msgstr "写文件时出错"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
 msgstr "写文件时出错"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr "截断文件失败"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
 msgstr "错误的报头数据"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "内部错误"
 
@@ -2054,11 +2104,40 @@ msgstr "无法 mmap 一个空文件"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "动态内存映射(Dynamic MMap)空间不足"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大侠。当前值：%lu。(man 5 "
+"apt.conf)"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
 msgstr "没有发现您的所选 %s"
@@ -2073,42 +2152,42 @@ msgstr "无法识别的类型缩写：“%c”"
 msgid "Opening configuration file %s"
 msgstr "正在打开配置文件 %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "语法错误 %s:%u：配置小节没有以名字开头"
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "语法错误 %s:%u：标签格式有误"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "语法错误 %s:%u: Included from here"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "语法错误 %s:%u: 不支持的指令“%s”"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
@@ -2175,7 +2254,7 @@ msgid "Unable to stat the mount point %s"
 msgstr "无法读取文件系统挂载点 %s 的状态"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"
@@ -2209,143 +2288,153 @@ msgstr "无法获得锁 %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子进程 %s 发生了段错误"
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "子进程 %s 发生了段错误"
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出了"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "读文件时出错，还剩 %lu 字节没有读出"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "写文件时出错，还剩 %lu 字节没有保存"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
 msgstr "关闭文件时出错"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
 msgstr "用 unlink 删除文件时出错"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
 msgstr "同步文件时出错"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
 msgstr "软件包缓存区是空的"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
 msgstr "软件包缓存区文件损坏了"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”这个版本控制系统"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
 msgstr "软件包缓存区是为其它架构的主机构造的"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
 msgstr "依赖"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
 msgstr "预依赖"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "建议"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "推荐"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "冲突"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "替换"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
 msgstr "废弃"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
 msgstr "破坏"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "必要"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "标准"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "可选"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
 msgstr "额外"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
 msgstr "正在分析软件包的依赖关系树"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "候选版本"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
 msgstr "生成依赖关系"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "正在读取状态信息"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "无法打开状态文件 %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入临时状态文件 %s"
@@ -2432,7 +2521,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2440,37 +2529,37 @@ msgstr ""
 "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
 "缘故。"
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 不见了。"
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "找不到“%spartial”这个目录。"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "正在下载第 %li 个文件，共 %li 个"
@@ -2485,17 +2574,17 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
 msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支持“%s”打包系统"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "无法确定适合的打包系统类型"
 
@@ -2516,16 +2605,18 @@ msgstr "无法解析或打开软件包的列表或是状态文件。"
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您可能需要运行 apt-get update 来解决这些问题"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "无法识别锁定的类型(pin type) %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 
@@ -2666,6 +2757,23 @@ msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 File
 msgid "Size mismatch"
 msgstr "大小不符"
 
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+#| msgid "Unable to parse package file %s (1)"
+msgid "Unable to parse Release file %s"
+msgstr "无法解析软件包文件 %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+#| msgid "Note, selecting %s instead of %s\n"
+msgid "No sections in Release file %s"
+msgstr "注意，选取 %s 而非 %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2724,6 +2832,12 @@ msgstr ""
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
 
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
@@ -2754,22 +2868,22 @@ msgstr "正在写入新的软件包源列表\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "对应于该光盘的软件包源设置项是：\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "已写入 %i 条记录。\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
@@ -2779,12 +2893,12 @@ msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
@@ -2794,61 +2908,82 @@ msgstr "正在删除 %s"
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 不见了"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "启动对 %s 的处理"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n"
 
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "无法对状态列表目录加锁"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "无法打开补丁文件"
@@ -2857,6 +2992,15 @@ msgstr "无法打开补丁文件"
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "启动对 %s 的处理"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "动态内存映射(Dynamic MMap)空间不足"
+
 #~ 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"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e7a0376cf..690a5a387 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,198 +8,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-06-29 21:41+0800\n"
-"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
-"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"PO-Revision-Date: 2009-01-28 10:41+0800\n"
+"Last-Translator: Tetralet <tetralet@gmail.com>\n"
+"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@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:143
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr "套件 %s 版本 %s 有未解決的相依問題:\n"
+msgstr "套件 %s 版本 %s 未能滿足相依性：\n"
 
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "無法找出套件 %s 的位置"
+msgstr "找不到套件 %s"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
 msgid "Total package names: "
-msgstr "所有套件的名稱"
+msgstr "套件名稱合計："
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
-msgstr "  普通套件："
+msgstr "  一般套件："
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
-msgstr "  虛擬套件："
+msgstr "  完全虛擬套件："
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
-msgstr "  單虛擬套件："
+msgstr "  單一虛擬套件："
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
 msgstr "  混合虛擬套件："
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
-msgstr "  失蹤："
+msgstr "  找不到："
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
-msgstr "所有不同版本"
+msgstr "個別版本合計："
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
-msgstr "所有不同版本的描述："
+msgstr "個別版本類別合計："
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
-msgstr "所有依存關係："
+msgstr "相依關係合計："
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
-msgstr "所有版本/檔案關聯："
+msgstr "版本/檔案關聯合計："
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
-msgstr "所有版本/檔案關聯： "
+msgstr "類別/檔案關聯合計："
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
-msgstr "所有提供套件對應："
+msgstr "提供者對應合計："
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
-msgstr "Glob 字串共計:"
+msgstr "所有字串合計："
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
-msgstr "所有相依版本空間:"
+msgstr "相依版本空間合計："
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
-msgstr "Slack 空間共計:"
+msgstr "間暇空間合計："
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
-msgstr "所有統計後的空間:"
+msgstr "統計後的空間合計："
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 #, c-format
 msgid "Package file %s is out of sync."
-msgstr "套件檔案 %s 已失去同步。"
+msgstr "套件檔 %s 未同步。"
 
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
-msgstr "您必須給定一完整的樣式"
+msgstr "您必須明確得給定一個樣式"
 
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "未找到套件"
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
-msgstr "套件檔案:"
+msgstr "套件檔："
 
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "快取資料同步過時,無法 x-ref 套件檔案"
-
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
+msgstr "快取資料未同步，無法 x-ref 套件檔"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
-msgstr "鎖定的套件:"
+msgstr "鎖定的套件："
 
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(未找到)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
-msgstr "已安裝:"
+msgstr "  已安裝："
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
-msgstr "(沒有)"
+msgstr "(無)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
-msgstr "  候選:"
+msgstr "  候選："
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
-msgstr "  套件鎖定: "
+msgstr "  套件鎖定："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
-msgstr "  版本表格:"
+msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s 是針對 %s 並在 %s %s 所編譯的\n"
+msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"
 
-#: cmdline/apt-cache.cc:1721
-#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+#: cmdline/apt-cache.cc:1726
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -237,57 +196,57 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
-"用法: apt-cache [選項] 命令\n"
-"       apt-cache [選項] add file1 [file2 ...]\n"
-"       apt-cache [選項] showpkg 套件1 [套件2 ...]\n"
-"       apt-cache [選項] showsrc 套件1 [套件2 ...]\n"
+"用法：apt-cache [選項] 指令\n"
+"      apt-cache [選項] add 檔案1 [檔案2 ...]\n"
+"      apt-cache [選項] showpkg 套件1 [套件2 ...]\n"
+"      apt-cache [選項] showsrc 套件1 [套件2 ...]\n"
 "\n"
-"apt-cache 是一個底層的工具,我們用它來操縱 APT 的二進制\n"
-"快取檔案,也用來查詢那些檔案中的相關訊息\n"
+"apt-cache 是一個低階的工具，可用來操作 APT 的二進制快取檔，也可用來\n"
+"查詢那些檔案中的相關訊息\n"
 "\n"
-"命令:\n"
-"   add - 往源碼快取中加入一個套件檔案\n"
-"   gencaches - 產生套件和源碼的快取\n"
-"   showpkg - 顯示套件的全面訊息\n"
-"   showsrc - 顯示源碼檔案的各項記錄\n"
-"   stats - 顯示一些基本的統計訊息\n"
-"   dump - 簡要顯示整個緩存文件的內容\n"
-"   dumpavail - 印出可取得的檔案到標準輸出(stdout)\n"
+"指令:\n"
+"   add - 把套件檔加入原始碼快取中\n"
+"   gencaches - 同時產生套件和原始碼的快取\n"
+"   showpkg - 顯示某單一套件的一般資訊\n"
+"   showsrc - 顯示原始碼報告\n"
+"   stats - 顯示一些基本的統計資訊\n"
+"   dump - 簡要得顯示整個檔案\n"
+"   dumpavail - 將可用的檔案列印至標準輸出\n"
 "   unmet - 顯示所有未滿足的相依關係\n"
-"   search - 根據正規表示法搜索套件列表\n"
-"   show - 顯示關於該套件的易於閱讀的報告\n"
-"   depends - 原原本本的顯示該套件的相依關係的訊息\n"
-"   rdepends - 顯示所有相依於該套件的套件名字\n"
-"   pkgnames - 列出所有套件的名稱\n"
-"   dotty - 產生 GraphViz 處理的套件關係圖\n"
-"   xvcg - 產生 xvcg 處理的套件的關係圖\n"
-"   policy - 顯示套件的安裝設定狀態\n"
+"   search - 根據正規表示式搜索套件列表\n"
+"   show - 顯示該套件的易於閱讀的報告\n"
+"   depends - 顯示該套件的原始相依關係的資訊\n"
+"   rdepends - 顯示所有相依於該套件的套件名稱\n"
+"   pkgnames - 列出系統中所有套件\n"
+"   dotty - 產生用於 GraphViz 的套件關係圖\n"
+"   xvcg - 產生用於 xvcg 的套件的關係圖\n"
+"   policy - 顯示套件的可安裝版本資訊\n"
 "\n"
-"選項:\n"
+"選項：\n"
 "  -h   本幫助訊息。\n"
 "  -p=? 套件的快取。\n"
-"  -s=? 源碼的快取。\n"
+"  -s=? 原始碼的快取。\n"
 "  -q   關閉進度顯示。\n"
-"  -i   僅為 unmet 命令顯示重要的相依關係。\n"
+"  -i   僅為 unmet 指令顯示重要的相依關係。\n"
 "  -c=? 讀取指定的設定檔\n"
-"  -o=? 設定任意指定的設定選項,例如 -o dir::cache=/tmp\n"
-"若要深入了解,您還可以查閱 apt-cache(8) 和 apt.conf(5) 參考手冊。\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
+"請參閱 apt-cache(8) 及 apt.conf(5) 參考手冊以取得更多資訊。\n"
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "請給這張光碟取個名字，比如說“Debian 2.1r1 Disk 1”"
+msgstr "請替這張光碟取個名字，像是 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:93
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "請放入光碟至光碟機，然後按 [Enter] 鍵。"
+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"
-msgstr "參數並非一對"
+msgstr "參數並未成對"
 
 #: cmdline/apt-config.cc:76
 msgid ""
@@ -304,23 +263,23 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"用法:apt-config [選項] 命令\n"
+"用法：apt-config [選項] 指令\n"
 "\n"
-"apt-config 是一個用於讀取 APT 設定檔案的簡單工具\n"
+"apt-config 是一個用於讀取 APT 設定檔的簡單工具\n"
 "\n"
-"命令:\n"
+"指令:\n"
 "   shell - Shell 模式\n"
-"   dump - 顯示設定檔案\n"
+"   dump - 顯示設定\n"
 "\n"
-"選項:\n"
-"  -h  本幫助訊息。\n"
-"  -c=? 讀取指定的設定檔案\n"
-"  -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n"
+"選項：\n"
+"  -h   本幫助訊息。\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
 #: cmdline/apt-extracttemplates.cc:98
 #, c-format
 msgid "%s not a valid DEB package."
-msgstr "%s 不是合法的 DEB 套件"
+msgstr "%s 並不是正確的 DEB 套件。"
 
 #: cmdline/apt-extracttemplates.cc:232
 msgid ""
@@ -335,25 +294,25 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"用法: apt-extracttemplates file1 [file2 ...]\n"
+"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
 "\n"
-"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板\n"
-"信息的工具\n"
+"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
+"的工具\n"
 "\n"
-"選項:\n"
-"  -h  本幫助訊息。\n"
-"  -t   設定 temp 目錄\n"
-"  -c=? 讀取指定的設定檔案\n"
-"  -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n"
+"選項\n"
+"  -h   本幫助訊息。\n"
+"  -t   指定暫存目錄\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
 #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
 #, c-format
 msgid "Unable to write to %s"
-msgstr "無法寫入『%s』。"
+msgstr "無法寫入 %s"
 
 #: cmdline/apt-extracttemplates.cc:310
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "無法取得 debconf 版本。debconf 是否安裝?"
+msgstr "無法取得 debconf 版本。是否有安裝 debconf？"
 
 #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
 msgid "Package extension list is too long"
@@ -364,20 +323,20 @@ msgstr "套件延伸列表過長"
 #: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
 #, c-format
 msgid "Error processing directory %s"
-msgstr "處理目錄 %s 時錯誤"
+msgstr "處理目錄 %s 時發生錯誤"
 
 #: ftparchive/apt-ftparchive.cc:251
 msgid "Source extension list is too long"
-msgstr "原碼的延伸列表太長"
+msgstr "原始碼的延伸列表太長"
 
 #: ftparchive/apt-ftparchive.cc:368
 msgid "Error writing header to contents file"
-msgstr "寫入標頭資訊到目錄檔案時出錯"
+msgstr "寫入標頭資訊到內容檔時發生錯誤"
 
 #: ftparchive/apt-ftparchive.cc:398
 #, c-format
 msgid "Error processing contents %s"
-msgstr "處理目錄 %s 時出錯"
+msgstr "處理內容 %s 時發生錯誤"
 
 #: ftparchive/apt-ftparchive.cc:553
 msgid ""
@@ -420,44 +379,42 @@ msgid ""
 "  -c=?  Read this configuration file\n"
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
-"用法: apt-ftparchive [選項] 命令\n"
-"命令: packages 二進制套件搜索路徑 [overridefile [pathprefix]]\n"
-"       sources 源碼搜索路徑 [overridefile [pathprefix]]\n"
-"       contents 搜索路徑\n"
-"       release 搜索路徑\n"
-"       generate 設定檔 [groups]\n"
-"       clean 設定檔\n"
+"用法：apt-ftparchive [選項] 指令\n"
+"指令：packages 二進制檔搜索路徑 [重新定義檔 [路徑前綴]]\n"
+"      sources 原始碼搜索路徑 [重新定義檔 [路徑前綴]]\n"
+"      contents 搜索路徑\n"
+"      release 搜索路徑\n"
+"      generate 設定檔 [群組]\n"
+"      clean 設定檔\n"
 "\n"
-"apt-ftparchive 用來為 Debian 套件產生索引檔案。它支援\n"
-"多種生成索引的方式，從自動化和功能性來說，是一套取代\n"
-"dpkg-scanpackages 和 dpkg-scansources 的工具\n"
+"apt-ftparchive 可用來替 Debian 套件庫建立索引檔。它支援了從全\n"
+"自動化到足以替代 dpkg-scanpackages 及 dpkg-scansources 所提供\n"
+"的所有功能等等各式各樣建立索引的方式。apt-ftparchive 會根據 .deb 檔案樹建立 "
+"Package 檔。Package 檔\n"
+"裡不僅包含了每個套件的 control 資料的內容，還包含了 MD5 檢驗\n"
+"碼和檔案大小。它還支援了重新定義檔，可用來強制指定優先等級及\n"
+"其所屬的類別。\n"
 "\n"
-"apt-ftparchive 能依據一個由 .deb 檔案構成的檔案樹產生 Package 檔案。\n"
-"Package 檔案不僅包含每個套件的 MD5 校驗碼和檔案大小,\n"
-"還有套件的所有控制字段的內容。同時支援 override 檔案,\n"
-"它可以強制指套件的優先等級及其所屬的套件類別。\n"
+"而同樣的，apt-ftparchive 也能根據 .dsc 檔案樹生成 Source 檔。\n"
+"可用 --source-override 選項來指定一個 src 重新定義檔。\n"
 "\n"
-"與上頭類似,apt-ftparchive 也能由 .dsc 的檔案樹生成 Source 檔案。\n"
-"使用 --source-override 選項來指定一個 override 檔案\n"
-"\n"
-"使用 'packages' 和 'source' 命令時,必須在檔案樹的根執行該程式。\n"
-"二進制檔案的搜索路徑一定要是遞迴搜索的底層,\n"
-"而且 override 檔案必須包含 override 旗標。如果 Pathprefix\n"
-"存在則加到 filename 字段。\n"
-"以 Debian 檔案庫舉例說明:\n"
+"應當在檔案樹的根目錄下執行 'packages' 和 'source' 指令。\n"
+"二進制檔的搜索路徑必須指向遞迴搜索的底層，且在重新定義檔裡必\n"
+"須包含 override 旗標。若指定了路徑前綴時，則會被附加到檔案名\n"
+"稱這個欄位裡。以 Debian 套件庫為例:\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
 "               dists/potato/main/binary-i386/Packages\n"
 "\n"
-"選項:\n"
+"選項：\n"
 "  -h    本幫助說明\n"
-"  --md5 產生 MD5 校驗控制碼\n"
-"  -s=?  源碼的 override 檔案\n"
-"  -q    輸出精簡信息\n"
-"  -d=?  指定選擇的快取資料庫\n"
-"  --no-delink 開啟delink的偵錯模式\n"
-"  --contents  產生控制內容檔案\n"
+"  --md5 控制如何產生 MD5 檢驗碼\n"
+"  -s=?  原始碼的重新定義檔\n"
+"  -q    安靜模式\n"
+"  -d=?  指定搭配的快取資料庫\n"
+"  --no-delink 啟用 DeLinking 模式\n"
+"  --contents  產生控制內容檔\n"
 "  -c=?  讀取指定的設定檔\n"
-"  -o=?  設定任意指定的設定選項"
+"  -o=?  指定任意的設定選項"
 
 #: ftparchive/apt-ftparchive.cc:759
 msgid "No selections matched"
@@ -466,28 +423,29 @@ msgstr "找不到符合的選項"
 #: ftparchive/apt-ftparchive.cc:832
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "套件檔案組  `%s' 缺少部份檔案"
+msgstr "套件檔案組 `%s' 少了部份檔案"
 
 #: ftparchive/cachedb.cc:43
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB 已損毀,檔案被更名成 %s.old"
+msgstr "DB 已損毀，檔案被更名為 %s.old"
 
 #: ftparchive/cachedb.cc:61
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
-msgstr "DB 過舊,嘗試更新 %s"
+msgstr "DB 過舊，嘗試升級 %s"
 
 #: ftparchive/cachedb.cc:72
 msgid ""
 "DB format is invalid. If you upgraded from a older version of apt, please "
 "remove and re-create the database."
-msgstr "資料庫格式錯誤。如果您升級舊版的 apt，請移除並重建資料庫。"
+msgstr ""
+"資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。"
 
 #: ftparchive/cachedb.cc:77
 #, c-format
 msgid "Unable to open DB file %s: %s"
-msgstr "無法開啟 DB 檔案 %s:%s"
+msgstr "無法開啟 DB 檔 %s: %s"
 
 #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
@@ -497,21 +455,21 @@ msgstr "無法取得 %s 的狀態"
 
 #: ftparchive/cachedb.cc:238
 msgid "Archive has no control record"
-msgstr "檔案沒有 control 記錄"
+msgstr "套件檔沒有 control 記錄"
 
 #: ftparchive/cachedb.cc:444
 msgid "Unable to get a cursor"
-msgstr "無法取得游標"
+msgstr "無法取得遊標"
 
 #: ftparchive/writer.cc:76
 #, c-format
 msgid "W: Unable to read directory %s\n"
-msgstr "W:無法讀取目錄 %s\n"
+msgstr "警告：無法讀取目錄 %s\n"
 
 #: ftparchive/writer.cc:81
 #, c-format
 msgid "W: Unable to stat %s\n"
-msgstr "W:無法取得 %s 狀態\n"
+msgstr "警告：無法取得 %s 狀態\n"
 
 #: ftparchive/writer.cc:132
 msgid "E: "
@@ -523,12 +481,12 @@ msgstr "警告："
 
 #: ftparchive/writer.cc:141
 msgid "E: Errors apply to file "
-msgstr "E:套用到檔案時出錯"
+msgstr "錯誤：套用到檔案時發生錯誤"
 
 #: ftparchive/writer.cc:158 ftparchive/writer.cc:188
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "無法解析路徑 %s"
+msgstr "無法解析 %s"
 
 #: ftparchive/writer.cc:170
 msgid "Tree walking failed"
@@ -542,22 +500,22 @@ msgstr "無法開啟 %s"
 #: ftparchive/writer.cc:254
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " 移除連結 %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
 #: ftparchive/writer.cc:262
 #, c-format
 msgid "Failed to readlink %s"
-msgstr "無法讀取符號鏈接 %s"
+msgstr "無法讀取連結 %s"
 
 #: ftparchive/writer.cc:266
 #, c-format
 msgid "Failed to unlink %s"
-msgstr "無法 unlink %s"
+msgstr "無法移除連結 %s"
 
 #: ftparchive/writer.cc:273
 #, c-format
 msgid "*** Failed to link %s to %s"
-msgstr "*** 無法將 %s 鏈接到 %s"
+msgstr "*** 無法將 %s 連結到 %s"
 
 #: ftparchive/writer.cc:283
 #, c-format
@@ -566,36 +524,36 @@ msgstr " 達到了 DeLink 的上限 %sB。\n"
 
 #: ftparchive/writer.cc:387
 msgid "Archive had no package field"
-msgstr "檔案無套件字符"
+msgstr "套件檔裡沒有套件資訊"
 
 #: ftparchive/writer.cc:395 ftparchive/writer.cc:610
 #, c-format
 msgid "  %s has no override entry\n"
-msgstr "  %s 無 override 項目\n"
+msgstr "  %s 沒有重新定義項目\n"
 
 #: ftparchive/writer.cc:440 ftparchive/writer.cc:698
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 套件維護者是 %s 非 %s\n"
+msgstr "  %s 的維護者是 %s，而非 %s\n"
 
 #: ftparchive/writer.cc:620
 #, c-format
 msgid "  %s has no source override entry\n"
-msgstr "  %s 無原始碼 override 項目\n"
+msgstr "  %s 沒有原始碼重新定義項目\n"
 
 #: ftparchive/writer.cc:624
 #, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr "  %s 無二元碼 override 項目\n"
+msgstr "  %s 也沒有二元碼重新定義項目\n"
 
 #: ftparchive/contents.cc:321
 #, c-format
 msgid "Internal error, could not locate member %s"
-msgstr "內部錯誤：無法找到成員 %s"
+msgstr "內部錯誤，找不找到成員 %s"
 
 #: ftparchive/contents.cc:358 ftparchive/contents.cc:389
 msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 無法配置記憶體空間"
+msgstr "realloc - 無法配置記憶體"
 
 #: ftparchive/override.cc:34 ftparchive/override.cc:142
 #, c-format
@@ -605,22 +563,22 @@ msgstr "無法開啟 %s"
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format
 msgid "Malformed override %s line %lu #1"
-msgstr "override 文件 %s 第 %lu 行的格式有誤 #1"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format
 msgid "Malformed override %s line %lu #2"
-msgstr "override 文件 %s 第 %lu 行的格式有誤 #2"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format
 msgid "Malformed override %s line %lu #3"
-msgstr "override 文件 %s 第 %lu 行的格式有誤 #3"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
 msgid "Failed to read the override file %s"
-msgstr "無法讀取 override 檔案 %s"
+msgstr "無法讀取重新定義檔 %s"
 
 #: ftparchive/multicompress.cc:72
 #, c-format
@@ -630,11 +588,11 @@ msgstr "未知的壓縮演算法 '%s'"
 #: ftparchive/multicompress.cc:102
 #, c-format
 msgid "Compressed output %s needs a compression set"
-msgstr "壓縮輸出 %s 需要一壓縮檔案集合"
+msgstr "要壓縮輸出 %s 需搭配壓縮動作"
 
 #: ftparchive/multicompress.cc:169 methods/rsh.cc:91
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "無法建立 IPC 管線到子程序"
+msgstr "無法和子程序建立 IPC 管線"
 
 #: ftparchive/multicompress.cc:195
 msgid "Failed to create FILE*"
@@ -651,7 +609,7 @@ msgstr "壓縮子程序"
 #: ftparchive/multicompress.cc:235
 #, c-format
 msgid "Internal error, failed to create %s"
-msgstr "內部錯誤,無法建立 %s"
+msgstr "內部錯誤，無法建立 %s"
 
 #: ftparchive/multicompress.cc:286
 msgid "Failed to create subprocess IPC"
@@ -659,399 +617,404 @@ msgstr "無法建立子程序 IPC"
 
 #: ftparchive/multicompress.cc:321
 msgid "Failed to exec compressor "
-msgstr "無法執行壓縮程序"
+msgstr "無法執行壓縮程式"
 
 #: ftparchive/multicompress.cc:360
 msgid "decompressor"
-msgstr "解壓縮程序"
+msgstr "解壓縮程式"
 
 #: ftparchive/multicompress.cc:403
 msgid "IO to subprocess/file failed"
-msgstr "IO 到子程序/檔案失效"
+msgstr "和子程序/檔案 IO 失敗"
 
 #: ftparchive/multicompress.cc:455
 msgid "Failed to read while computing MD5"
-msgstr "在計算 MD5 時無法讀取資料"
+msgstr "在計算 MD5 時無法讀取到資料"
 
 #: ftparchive/multicompress.cc:472
 #, c-format
 msgid "Problem unlinking %s"
-msgstr "在 unlink %s 時出錯"
+msgstr "在取消 %s 的連結時發生問題"
 
 #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "無法將 %s 更名為 %s"
 
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
 #, c-format
 msgid "Regex compilation error - %s"
-msgstr "編譯正規表示法出錯 - %s"
+msgstr "編譯正規表示式時發生錯誤 - %s"
 
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
-msgstr "下列的套件有無法滿足的依存關係："
+msgstr "下列的套件有未滿足的相依關係："
 
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
-msgstr "但是『%s』卻已經安裝好了。"
+msgstr "但 %s 卻已安裝"
 
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
-msgstr "但是『%s』卻將被安裝。"
+msgstr "但 %s 卻將被安裝"
 
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
-msgstr "但是它卻無法安裝。"
+msgstr "但它卻無法安裝"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
-msgstr "但是它只是虛擬的套件"
+msgstr "但它是虛擬套件"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
-msgstr "但是『』卻還沒有安裝。"
+msgstr "但它卻尚未安裝"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
-msgstr "但是它卻不會被安裝。"
+msgstr "但它卻將不會被安裝"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr "或"
 
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
-msgstr "下列的【新】套件都將被安裝："
+msgstr "下列【新】套件將會被安裝："
 
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
-msgstr "下列的套件都將被【刪除】："
+msgstr "下列套件將會被【移除】："
 
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
-msgstr "下列的套件都將維持舊版本:"
+msgstr "下列套件將會維持其原有版本："
 
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
-msgstr "下列的套件都將更新:"
+msgstr "下列套件將會被升級："
 
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
-msgstr "下列的套件都將被「降級」:"
+msgstr "下列套件將會被【降級】："
 
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
-msgstr "下列押後的套件都將被更改："
+msgstr "下列被保留 (hold) 的套件將會被更改："
 
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s（因為 %s）"
 
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
 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:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "更新 %lu 個套件，新安裝 %lu 個套件，"
+msgstr "升級 %lu 個，新安裝 %lu 個，"
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "重新安裝 %lu 個套件，"
+msgstr "重新安裝 %lu 個，"
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
-msgstr "降 %lu 個套件的版，"
+msgstr "降級 %lu 個，"
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n"
+msgstr "移除 %lu 個，有 %lu 個未被升級。\n"
 
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
-msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n"
+msgstr "%lu 個沒有完整得安裝或移除。\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
 msgid "Correcting dependencies..."
-msgstr "更正依存關係中..."
+msgstr "正在修正相依關係..."
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
 msgid " failed."
-msgstr "失敗"
+msgstr " 失敗。"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "Unable to correct dependencies"
-msgstr "無法更正依存關係。"
+msgstr "無法修正相依關係"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 msgid "Unable to minimize the upgrade set"
-msgstr "無法最小化升級的套件集合"
+msgstr "無法將升級計劃最小化"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681
 msgid " Done"
 msgstr " 完成"
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
 msgid "You might want to run `apt-get -f install' to correct these."
-msgstr "用『apt-get -f install』指令或許能修正這些問題。"
+msgstr "您也許得執行 `apt-get -f install' 以修正這些問題。"
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688
 msgid "Unmet dependencies. Try using -f."
-msgstr "無法滿足相依關係。試試看 -f 選項。"
+msgstr "未能滿足相依關係。試試 -f 選項。"
 
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "警告：下列的套件驗證失敗！"
+msgstr "【警告】：無法驗證下列套件！"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714
 msgid "Authentication warning overridden.\n"
-msgstr "忽略了認證警告。\n"
+msgstr "忽略了驗證警告。\n"
 
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721
 msgid "Install these packages without verification [y/N]? "
-msgstr "不驗證這些套件就直接安裝？[y/N]"
+msgstr "是否不經驗證就安裝這些套件？[y/N]"
 
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723
 msgid "Some packages could not be authenticated"
-msgstr "部份套件無法驗證"
+msgstr "有部份套件無法驗證"
 
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
 msgid "There are problems and -y was used without --force-yes"
-msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes"
+msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用"
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "內部錯誤，InstallPackages 被用在了無法安裝的套上！"
+msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785
 msgid "Packages need to be removed but remove is disabled."
-msgstr "有套件需要被移除,但移除動作被禁止。"
+msgstr "有套件需要被移除，但卻被禁止移除。"
 
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796
 msgid "Internal error, Ordering didn't finish"
-msgstr "內部錯誤，Ordering didn't finish"
+msgstr "內部錯誤，排序未能完成"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
 msgid "Unable to lock the download directory"
-msgstr "無法鎖定下載的目錄"
+msgstr "無法鎖定下載目錄"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
-msgstr "無法讀取來源單。"
+msgstr "無法讀取來源列表。"
 
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "怪了……檔案大小不符，發信給 apt@packages.debian.org 吧"
+msgstr "怪哉... 檔案大小不符，請發信給 apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
-msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n"
+msgstr "需要下載 %sB/%sB 的套件檔。\n"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845
 #, c-format
 msgid "Need to get %sB of archives.\n"
-msgstr "需要下載 %sB 的檔案。\n"
+msgstr "需要下載 %sB 的套件檔。\n"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "經過該處置後將消耗 %sB 的空間。\n"
+msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "經過該處置後將空出 %sB 的空間。\n"
+msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
 #, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "%s 無法足夠的空間。"
+msgstr "無法確認 %s 的未使用空間"
 
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "You don't have enough free space in %s."
-msgstr "『%s』內沒有足夠的空間。"
+msgstr "在 %s 裡沒有足夠的的未使用空間。"
 
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
 msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。"
+msgstr "雖然指定了 Trivial Only（自動答 NO）選項，但這並不是 trivial 操作。"
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892
 msgid "Yes, do as I say!"
-msgstr "是的,請執行我所指定的"
+msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
-"您的操作會導致潛在的危險\n"
-"若要繼續的話,就輸入下面的句子“%s”\n"
+"您所進行的操作可能會帶來危險。\n"
+"請輸入 '%s' 這個句子以繼續進行\n"
 " ?] "
 
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
 msgid "Abort."
 msgstr "放棄執行。"
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915
 msgid "Do you want to continue [Y/n]? "
-msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 "
+msgstr "是否繼續進行 [Y/n]？"
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr "無法下載『%s』檔案。%s\n"
+msgstr "無法取得 %s，%s\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
 msgid "Some files failed to download"
-msgstr "部份檔案無法下載"
+msgstr "有部份檔案無法下載"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
 msgid "Download complete and in download only mode"
-msgstr "下載完畢,目前是“僅下載”模式"
+msgstr "下載完成，且這是『僅下載』模式"
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n"
-"選項?"
+"有部份套件檔無法取得，試著執行 apt-get update 或者試著加上 --fix-missing 選"
+"項？"
 
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)"
+msgstr "目前尚未支援 --fix-missing 和媒體抽換"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
 msgid "Unable to correct missing packages."
-msgstr "無法更正遺失的套件。"
+msgstr "無法修正欠缺的套件。"
 
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
 msgid "Aborting install."
 msgstr "放棄安裝。"
 
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
-msgstr "注意,選擇了 %s 而非 %s\n"
+msgstr "注意，選擇了以 %s 替代 %s\n"
 
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n"
+msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
-msgstr "套件『%s』沒有安裝，所以無法刪除。\n"
+msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
-msgstr "虛擬套件『%s』的提供者是：\n"
+msgstr "套件 %s 是虛擬套件，提供者為：\n"
 
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
 msgid " [Installed]"
 msgstr "【已安裝】"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112
 msgid "You should explicitly select one to install."
 msgstr "請您明確地選擇一個來進行安裝。"
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 msgstr ""
-"現在沒有可用的套件 %s,但是它被其它的套件引用了。\n"
-"這可能意味著這個套件已經消失或捨棄,\n"
-"或者只能在其他原碼中找到\n"
+"無法取得套件 %s，但它卻被其它的套件引用了。\n"
+"這意味著這個套件可能已經消失了、被廢棄了，或是只能由其他的來源取得\n"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136
 msgid "However the following packages replace it:"
-msgstr "但是下列的套件將取代它："
+msgstr "然而，下列的套件取代了它："
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139
 #, c-format
 msgid "Package %s has no installation candidate"
-msgstr "套件 %s 還沒有可供安裝的候選版本"
+msgstr "套件 %s 沒有可安裝的候選版本"
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "不能重新安裝 %s,因為無法下載它。\n"
+msgstr "無法重新安裝 %s，因為它無法下載。\n"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167
 #, c-format
 msgid "%s is already the newest version.\n"
-msgstr "『%s』已經是最新版本了。\n"
+msgstr "%s 已經是最新版本了。\n"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Release '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”發布版本"
+msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
 
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "Version '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”版本"
+msgstr "找不到 '%s' 版的 '%s'"
 
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
-msgstr "選定的版本為 %s (%s) 的 %s\n"
+msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348
 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361
 msgid "Unable to lock the list directory"
 msgstr "無法鎖定列表目錄"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "我們將不刪除任何東西，無法啟動AutoRemover"
+msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover"
 
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr "下列的套件都將自動安裝："
+msgstr "以下套件是被自動安裝進來的，且已不再會被用到了："
 
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447
 msgid "Use 'apt-get autoremove' to remove them."
-msgstr "使用 'apt-get autoremove' 來移除這些"
+msgstr "使用 'apt-get autoremove' 來將其移除。"
 
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
-"恩，看起來AutoRemover損毀了某個東西，這不該發生的。請針對該 apt 發佈臭蟲。"
+"嗯，看起來 AutoRemover 弄壞了什麼東西，而這是不該發生的。\n"
+"請針對 apt 發佈錯誤回報。"
 
 #.
 #. if (Packages == 1)
@@ -1063,209 +1026,208 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
 msgid "The following information may help to resolve the situation:"
-msgstr "底下的資訊有助於解決現在的情況:"
+msgstr "以下的資訊或許有助於解決當前的情況："
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "內部錯誤，AutoRemover 處理失敗"
 
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "內部錯誤,AllUpgrade 造成錯誤"
+msgstr "內部錯誤，AllUpgrade 造成了損壞"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533
 #, c-format
 msgid "Couldn't find task %s"
-msgstr "無法找到 %s 作業。"
+msgstr "無法找到主題 %s"
 
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
 #, c-format
 msgid "Couldn't find package %s"
-msgstr "無法找到 %s 套件。"
+msgstr "無法找到套件 %s"
 
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
-msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
+msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715
 msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr "用『apt-get -f install』指令或許能修正這些問題。"
+msgstr "您也許得執行 `apt-get -f install' 以修正這些問題："
 
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
-"定一個解決辦法)。"
+"未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解"
+"決方案）。"
 
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""
-"有一些套件無法被安裝。這也許是系統無法實現您要求的狀態\n"
-"或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
-"或從 Incoming 目錄移除。"
+"有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
+"unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
 
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1748
 msgid "Broken packages"
 msgstr "損毀的套件"
 
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1777
 msgid "The following extra packages will be installed:"
-msgstr "下列的【新】套件都將被安裝："
+msgstr "下列的額外套件將被安裝："
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1866
 msgid "Suggested packages:"
-msgstr "建議(Suggested)的套件:"
+msgstr "建議套件："
 
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1867
 msgid "Recommended packages:"
-msgstr "推薦(Recommended)的套件:"
+msgstr "推薦套件："
 
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1896
 msgid "Calculating upgrade... "
-msgstr "籌畫升級套件中..."
+msgstr "籌備升級中... "
 
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1904
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
 msgid "Internal error, problem resolver broke stuff"
-msgstr "內部錯誤，problem resolver 處理失敗"
+msgstr "內部錯誤，問題排除器造成了損壞"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2079
 msgid "Must specify at least one package to fetch source for"
-msgstr "必須指定至少一個對應的套件才能下載源碼"
+msgstr "在取得原始碼時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unable to find a source package for %s"
-msgstr "無法找到 %s 套件的源碼"
+msgstr "無法找到 %s 的原始碼套件"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "略過已被下載的檔案“%s”\n"
+msgstr "略過已下載的檔案 '%s'\n"
 
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2186
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "『%s』內沒有足夠的空間。"
+msgstr "在 %s 裡沒有足夠的的未使用空間"
 
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2192
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
+msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
 
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "需要下載 %sB 的原始檔案。\n"
+msgstr "需要下載 %sB 的原始套件檔。\n"
 
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2201
 #, c-format
 msgid "Fetch source %s\n"
-msgstr "下載源碼 %s\n"
+msgstr "取得原始碼 %s\n"
 
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2232
 msgid "Failed to fetch some archives."
-msgstr "無法下載某些檔案。"
+msgstr "無法取得某些套件檔。"
 
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
+msgstr "不解開，因原始碼已解開至 %s\n"
 
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Unpack command '%s' failed.\n"
-msgstr "執行解開套件指令 '%s' 時失敗。\n"
+msgstr "解開指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2273
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "請檢查是否安裝了“dpkg-dev”套件。\n"
+msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2290
 #, c-format
 msgid "Build command '%s' failed.\n"
-msgstr "執行建立套件指令 '%s' 時失敗。\n"
+msgstr "編譯指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2309
 msgid "Child process failed"
 msgstr "子程序失敗"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2325
 msgid "Must specify at least one package to check builddeps for"
-msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
+msgstr "在檢查編譯相依關係時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2353
 #, c-format
 msgid "Unable to get build-dependency information for %s"
-msgstr "無法取得 %s 的建構相依關係。"
+msgstr "無法取得 %s 的編譯相依關係資訊"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2373
 #, c-format
 msgid "%s has no build depends.\n"
-msgstr "%s 無建立相依關係訊息。\n"
+msgstr "%s 沒有編譯相依關係。\n"
 
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2425
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
-msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係"
+msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
 
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2478
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
-"由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
-"相依關係"
+"無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
 
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了"
+msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2541
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
+msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s"
 
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2555
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "無法滿足套件 %s 所要求的建構相依關係。"
+msgstr "無法滿足套件 %s 的編譯相依關係。"
 
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2559
 msgid "Failed to process build dependencies"
-msgstr "無法處理建構相依關係"
+msgstr "無法處理編譯相依關係"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2591
 msgid "Supported modules:"
-msgstr "支援模組:"
+msgstr "已支援模組："
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2632
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1281,7 +1243,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1308,46 +1270,54 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"用法: apt-get [選項] 命令\n"
-"       apt-get [選項] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [選項] source pkg1 [pkg2 ...]\n"
+"用法：apt-get [選項] 指令\n"
+"      apt-get [選項] install|remove 套件1 [套件2 ...]\n"
+"      apt-get [選項] source 套件1 [套件2 ...]\n"
 "\n"
-"apt-get 提供了一個用於下載和安裝套件的簡易命令界面。\n"
-"最常用命令是 update 和 install。\n"
+"apt-get 是一個用來下載和安裝套件的簡易命令列界面。\n"
+"最常用指令是 update 和 install。\n"
 "\n"
-"命令:\n"
-"   update - 取得套件的更新列表\n"
-"   upgrade - 進行一次升級\n"
-"   install - 安裝新的套件(注:套件名稱是 libc6 而非 libc6.deb)\n"
-"   remove - 移除套件(保留設定檔)\n"
-"   autoremove·-·自動移除未使用到的套件\n"
-"   purge·-·完整移除套件(刪除設定檔)\n"
+"指令:\n"
+"   update - 取得新的套件列表\n"
+"   upgrade - 進行升級\n"
+"   install - 安裝新套件（套件名稱是 libc6 而不是 libc6.deb）\n"
+"   remove - 移除套件\n"
+"   autoremove - 自動移除所有不再使用的套件\n"
+"   purge - 移除並清除套件\n"
 "   source - 下載套件原始碼\n"
-"   build-dep - 為原始碼套件設定建構的相依關係\n"
-"   dist-upgrade - 發行版本升級,參閱 apt-get(8)\n"
-"   dselect-upgrade·-·採用 dselect·的選項升級\n"
-"   clean - 刪除所有已下載的套件檔案\n"
-"   auto-clean - 刪除已下載的套件檔案較舊的版本\n"
-"   check - 核對以確認系統的相依關係的完整性\n"
+"   build-dep - 為原始碼套件配置編譯相依關係\n"
+"   dist-upgrade - 發行版本升級，請參閱 apt-get(8)\n"
+"   dselect-upgrade - 採用 dselect 的選項升級\n"
+"   clean - 刪除已下載的套件檔\n"
+"   auto-clean - 刪除已下載但已有新版本的套件檔\n"
+"   check - 檢查相依關係是否有問題\n"
 "\n"
-"選項:\n"
+"選項：\n"
 "  -h  本求助訊息。\n"
-"  -q  讓輸出作為記錄檔 - 不顯示進度\n"
-"  -qq 除了錯誤外,皆不產生任何訊息\n"
-"  -d  僅下載 - 『不』安裝或解開套件檔案\n"
-"  -s  不作實際操作。只是模擬執行命令\n"
-"  -y  對所有詢問都作肯定的回答,同時不作任何提示\n"
-"  -f  嘗試修正系統損毀的套件相依關係\n"
-"  -m  當有套件檔案無法找到時,仍嘗試繼續執行\n"
+"  -q  讓輸出可作為記錄檔之用 - 不顯示進度\n"
+"  -qq 除了錯誤外，不顯示其它資訊\n"
+"  -d  僅下載 - 【不】安裝或解開套件檔\n"
+"  -s  不實際進行。只是模擬執行指令\n"
+"  -y  對所有詢問都回答 Yes，同時不會有任何提示\n"
+"  -f  嘗試修正系統上損毀的套件相依關係\n"
+"  -m  當有套件檔無法找到時，仍試著繼續進行\n"
 "  -u  顯示已升級的套件列表\n"
-"  -b  在下載完套件原始碼後,編譯產生對應的套件\n"
+"  -b  在取得套件原始碼後進行編譯\n"
 "  -V  顯示詳盡的版本號碼\n"
-"  -c=? 讀取指定的設定檔案\n"
-"  -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n"
-"請參閱 apt-get(8)、sources.list(5) 和 apt.conf(5)的使用手冊\n"
-"以取得更多訊息和選項。\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
+"請參閱 apt-get(8)、sources.list(5) 及 apt.conf(5) 的使用手冊\n"
+"以取得更多資訊和選項。\n"
 "                        該 APT 有著超級牛力。\n"
 
+#: cmdline/apt-get.cc:2799
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "已有 "
@@ -1367,7 +1337,7 @@ msgstr "錯誤 "
 #: cmdline/acqprogress.cc:135
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "讀取 %sB 用了 %s (%sB/s)\n"
+msgstr "取得 %sB 用了 %s (%sB/s)\n"
 
 #: cmdline/acqprogress.cc:225
 #, c-format
@@ -1381,13 +1351,13 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
-"更換媒體:請把名為\n"
-" '%s' 的光碟\n"
-"插入 '%s' 碟機,然後按 [Enter] 鍵。\n"
+"更換媒體：請把以下名稱的光碟\n"
+" '%s'\n"
+"放入 '%s' 裝置，然後按 [Enter] 鍵\n"
 
 #: cmdline/apt-sortpkgs.cc:86
 msgid "Unknown package record!"
-msgstr "未知的套件記錄!"
+msgstr "未知的套件記錄！"
 
 #: cmdline/apt-sortpkgs.cc:150
 msgid ""
@@ -1402,41 +1372,40 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"用法: apt-sortpkgs [選項] file1 [file2 ...]\n"
+"用法：apt-sortpkgs [選項] 檔案1 [檔案2 ...]\n"
 "\n"
-"apt-sortpkgs 是對套件索引檔案內容進行排序的簡單工具。-s 選項\n"
-"是用來指出該檔的檔案類型。\n"
+"apt-sortpkgs 是用來排序套件檔的簡單工具。-s 選項是用來指定它的檔案類型。\n"
 "\n"
-"選項:\n"
-"  -h  本幫助訊息。\n"
-"  -s   根據源碼檔案排序\n"
-"  -c=? 讀取指定的設定檔案\n"
-"  -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n"
+"選項：\n"
+"  -h   本幫助訊息。\n"
+"  -s   根據原始檔排序\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
 #: dselect/install:32
 msgid "Bad default setting!"
-msgstr "錯誤的預設設定!"
+msgstr "錯誤的預設設定！"
 
 #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
 #: dselect/install:105 dselect/update:45
 msgid "Press enter to continue."
-msgstr "請按 [Enter] 鍵繼續。"
+msgstr "請按 [Enter] 鍵以繼續進行。"
 
 #: dselect/install:91
 msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "您想移除任何先前下載的 deb 檔案嗎？"
+msgstr "您想移除所有先前下載的 .deb 檔嗎？"
 
 #: dselect/install:101
 msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "解開套件時發生錯誤。我要準備設定"
+msgstr "在解開套件時發生錯誤。我要準備設定"
 
 #: dselect/install:102
 msgid "packages that were installed. This may result in duplicate errors"
-msgstr "套件已安裝過。這將造成重複性的錯誤"
+msgstr "套件已安裝過。這會造成重複錯誤"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "或因為失去相依關係所造成的錯誤。只有該錯誤可被容忍"
+msgstr "或是因為沒有相依關係而造成錯誤。那麼這個錯誤是無關緊要的"
 
 #: dselect/install:104
 msgid ""
@@ -1445,7 +1414,7 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
 
 #: dselect/update:30
 msgid "Merging available information"
-msgstr "結合現有資料中"
+msgstr "整合現有的資料"
 
 #: apt-inst/contrib/extracttar.cc:114
 msgid "Failed to create pipes"
@@ -1457,62 +1426,62 @@ msgstr "無法執行 gzip"
 
 #: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
 msgid "Corrupted archive"
-msgstr "損毀的檔案"
+msgstr "損毀的套件檔"
 
 #: apt-inst/contrib/extracttar.cc:193
 msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar checksum 失敗,檔案已損毀"
+msgstr "Tar checksum 失敗，套件檔已損毀"
 
 #: apt-inst/contrib/extracttar.cc:296
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 標頭型別 %u, member 訊息 %s"
+msgstr "未知的 TAR 標頭類型 %u，成員 %s"
 
 #: apt-inst/contrib/arfile.cc:70
 msgid "Invalid archive signature"
-msgstr "無效的檔案籤章"
+msgstr "無效的套件庫簽章"
 
 #: apt-inst/contrib/arfile.cc:78
 msgid "Error reading archive member header"
-msgstr "讀取檔案 member 標頭訊息時出錯"
+msgstr "讀取套件檔的成員標頭訊息時發生錯誤"
 
 #: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
 msgid "Invalid archive member header"
-msgstr "無效的檔案 member 標頭"
+msgstr "無效的套件檔成員標頭"
 
 #: apt-inst/contrib/arfile.cc:128
 msgid "Archive is too short"
-msgstr "檔案過短"
+msgstr "套件檔過短"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Failed to read the archive headers"
-msgstr "讀取檔案標頭失敗"
+msgstr "讀取套件檔標頭失敗"
 
 #: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
-msgstr "DropNode 在還有 linked node 時被呼叫"
+msgstr "DropNode 在還有連結結點時被呼叫"
 
 #: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
-msgstr "尋找雜湊元件失敗!"
+msgstr "找不到雜湊元件！"
 
 #: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
-msgstr "分配轉移(diversion)失敗"
+msgstr "在配置抽換資訊時失敗"
 
 #: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
-msgstr "內部錯誤於 AddDiversion"
+msgstr "在 AddDiversion 發生了內部錯誤"
 
 #: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "試圖改寫一個轉移(diversion)，%s -> %s 和 %s/%s"
+msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s"
 
 #: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
-msgstr "重複加入轉移(diversion) %s -> %s"
+msgstr "重複加入抽換資訊 %s -> %s"
 
 #: apt-inst/filelist.cc:549
 #, c-format
@@ -1542,21 +1511,21 @@ msgstr "解開 %s 超過一次"
 #: apt-inst/extract.cc:134
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "路徑 %s 已被轉向(diverted)"
+msgstr "路徑 %s 已被抽換"
 
 #: apt-inst/extract.cc:144
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "此套件試圖寫入改變過的目標 %s/%s"
+msgstr "此套件試圖寫至抽換後的目標 %s/%s"
 
 #: apt-inst/extract.cc:154 apt-inst/extract.cc:297
 msgid "The diversion path is too long"
-msgstr "轉移(diversion)路徑過長"
+msgstr "要進行抽換的路徑過長"
 
 #: apt-inst/extract.cc:240
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
-msgstr "目錄 %s 已經被非目錄檔案取代"
+msgstr "目錄 %s 已經被非目錄的檔案所取代"
 
 #: apt-inst/extract.cc:280
 msgid "Failed to locate node in its hash bucket"
@@ -1569,24 +1538,24 @@ msgstr "路徑過長"
 #: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
-msgstr "複寫套件 %s 無符合版本"
+msgstr "以無版本的 %s 覆寫原始套件"
 
 #: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
-msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案"
+msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 #, c-format
 msgid "Unable to read %s"
-msgstr "無法讀取『%s』。"
+msgstr "無法讀取 %s"
 
 #: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
-msgstr "無法讀取 %s 的資料"
+msgstr "無法取得 %s 的狀態"
 
 #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
 #, c-format
@@ -1596,28 +1565,28 @@ msgstr "無法移除 %s"
 #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
 #, c-format
 msgid "Unable to create %s"
-msgstr "無法創造 %s"
+msgstr "無法建立 %s"
 
 #: apt-inst/deb/dpkgdb.cc:114
 #, c-format
 msgid "Failed to stat %sinfo"
-msgstr "無法讀取 %s 的資料"
+msgstr "無法取得 %sinfo 的狀態"
 
 #: apt-inst/deb/dpkgdb.cc:119
 msgid "The info and temp directories need to be on the same filesystem"
-msgstr "資料目錄與暫存目錄需在同一檔案系統"
+msgstr "資料目錄與暫存目錄需位於同一檔案系統中"
 
 #. Build the status cache
 #: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
 #: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
 #: apt-pkg/pkgcachegen.cc:957
 msgid "Reading package lists"
-msgstr "讀取套件清單中"
+msgstr "正在讀取套件清單"
 
 #: apt-inst/deb/dpkgdb.cc:176
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
-msgstr "無法變換 admin 目錄至 %sinfo"
+msgstr "無法切換至管理者目錄 %sinfo"
 
 #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
 #: apt-inst/deb/dpkgdb.cc:444
@@ -1626,7 +1595,7 @@ msgstr "內部錯誤，無法取得套件名稱"
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
 msgid "Reading file listing"
-msgstr "讀取軟件表中"
+msgstr "正在讀取檔案清單"
 
 #: apt-inst/deb/dpkgdb.cc:212
 #, c-format
@@ -1635,13 +1604,13 @@ msgid ""
 "then make it empty and immediately re-install the same version of the "
 "package!"
 msgstr ""
-"讀取清單檔案「%sinfo/%s」失敗。如果您無法還原此檔案\n"
-"請使檔案空白並馬上重新安裝相同版本的套件。"
+"無法開啟清單檔 %sinfo/%s。如果您無法將此檔案還原，請清除檔案內容，然後立即重"
+"新安裝同一版本的套件！"
 
 #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
-msgstr "讀取清單檔案「%sinfo/%s」失敗"
+msgstr "無法讀取清單檔 %sinfo/%s"
 
 #: apt-inst/deb/dpkgdb.cc:262
 msgid "Internal error getting a node"
@@ -1650,21 +1619,21 @@ msgstr "內部錯誤，無法取得節點"
 #: apt-inst/deb/dpkgdb.cc:305
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
-msgstr "讀取轉移檔案 %sdiversions 失敗"
+msgstr "讀取抽換檔 %sdiversions 失敗"
 
 #: apt-inst/deb/dpkgdb.cc:320
 msgid "The diversion file is corrupted"
-msgstr "套件轉移檔損壞"
+msgstr "抽換檔已損壞"
 
 #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
 #: apt-inst/deb/dpkgdb.cc:337
 #, c-format
 msgid "Invalid line in the diversion file: %s"
-msgstr "無效的行於轉移檔案 %s 中"
+msgstr "在抽換檔中的這一行有誤：%s"
 
 #: apt-inst/deb/dpkgdb.cc:358
 msgid "Internal error adding a diversion"
-msgstr "內部錯誤：新增轉移(diversion)失敗"
+msgstr "內部錯誤：在新增抽換資料時發生錯誤"
 
 #: apt-inst/deb/dpkgdb.cc:379
 msgid "The pkg cache must be initialized first"
@@ -1673,32 +1642,32 @@ msgstr "套件快取必須先初始化"
 #: apt-inst/deb/dpkgdb.cc:439
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
-msgstr "開啟套件失敗：檔案標頭，位移(offset) %lu"
+msgstr "找不到套件：檔案標頭，位移 %lu"
 
 #: apt-inst/deb/dpkgdb.cc:461
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "壞的 ConfFile 區段於 status 檔案。位移(offset) %lu"
+msgstr "在 status 檔中的 ConfFile 區段損壞。位移 %lu"
 
 #: apt-inst/deb/dpkgdb.cc:466
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
-msgstr "解析 MD5 錯誤。位移(offset) %lu"
+msgstr "在解析 MD5 時發生錯誤。位移 %lu"
 
 #: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "無效的 DEB 檔案，遺失 %s 成員"
+msgstr "這是個不正確的 DEB 套件檔，沒有 '%s' 成員"
 
 #: apt-inst/deb/debfile.cc:50
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "無效的 DEB 檔案，遺失 '%s', '%s' 或 '%s' 成員"
+msgstr "這是個不正確的 DEB 套件檔，沒有 '%s', '%s' 或 '%s' 成員"
 
 #: apt-inst/deb/debfile.cc:110
 #, c-format
 msgid "Couldn't change to %s"
-msgstr "無法變換目錄至 %s"
+msgstr "無法切換至 %s"
 
 #: apt-inst/deb/debfile.cc:140
 msgid "Internal error, could not locate member"
@@ -1706,37 +1675,36 @@ msgstr "內部錯誤：無法找到成員"
 
 #: apt-inst/deb/debfile.cc:173
 msgid "Failed to locate a valid control file"
-msgstr "找不到有效的 control 檔案"
+msgstr "找不到可用的 control 檔"
 
 #: apt-inst/deb/debfile.cc:258
 msgid "Unparsable control file"
-msgstr "無法分析的 control 檔案"
+msgstr "無法分析的 control 檔"
 
 #: methods/cdrom.cc:114
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr "無法讀取碟片資料庫『%s』。"
+msgstr "無法讀取光碟片資料庫 %s"
 
 #: methods/cdrom.cc:123
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
-"要讓本程式辨認此碟片，請用『apt-cdrom』工具。『apt-get update』不能用來製造新"
-"的碟片。"
+"請用 apt-cdrom 來讓 APT 能辨識這張光碟。apt-get update 是不能用來新增光碟的"
 
 #: methods/cdrom.cc:131
 msgid "Wrong CD-ROM"
-msgstr "碟片不正確。"
+msgstr "不正確的光碟"
 
 #: methods/cdrom.cc:166
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。"
+msgstr "無法卸載 %s 裡的光碟片，或許它仍在使用中。"
 
 #: methods/cdrom.cc:171
 msgid "Disk not found."
-msgstr "找不到磁碟"
+msgstr "找不到磁碟。"
 
 #: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
@@ -1745,15 +1713,15 @@ msgstr "找不到檔案"
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
 #: methods/rred.cc:234 methods/rred.cc:243
 msgid "Failed to stat"
-msgstr "無法讀取資料"
+msgstr "無法取得狀態"
 
 #: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
 msgid "Failed to set modification time"
-msgstr "日期更新失敗"
+msgstr "無法設定修改時間"
 
 #: methods/file.cc:44
 msgid "Invalid URI, local URIS must not start with //"
-msgstr "通用資源識別號錯誤。本機資源識別號不應以『//』起頭。"
+msgstr "不正確的 URI，本機 URI 不應以 // 開頭"
 
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc:162
@@ -1762,42 +1730,43 @@ msgstr "登入中"
 
 #: methods/ftp.cc:168
 msgid "Unable to determine the peer name"
-msgstr "無法解析對方主機名稱。"
+msgstr "無法解析對方主機名稱"
 
 #: methods/ftp.cc:173
 msgid "Unable to determine the local name"
-msgstr "無法解析本機名稱。"
+msgstr "無法解析本機名稱"
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
 msgid "The server refused the connection and said: %s"
-msgstr "伺服器因『%s』不受理。"
+msgstr "伺服器不接受連線，並回應：%s"
 
 #: methods/ftp.cc:210
 #, c-format
 msgid "USER failed, server said: %s"
-msgstr "『USER』指令因『%s』失敗。"
+msgstr "USER 指令失敗，伺服器回應：%s"
 
 #: methods/ftp.cc:217
 #, c-format
 msgid "PASS failed, server said: %s"
-msgstr "『PASS』指令因『%s』失敗。"
+msgstr "PASS 指令失敗，伺服器回應：%s"
 
 #: methods/ftp.cc:237
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
-msgstr "媒介伺服器設定應包括登入稿。"
+msgstr ""
+"指定了代理伺服器，但沒有指定登入 script，Acquire::ftp::ProxyLogin 是空的。"
 
 #: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "登入稿『%s』因『%s』失敗。"
+msgstr "登入 script 指令 '%s' 失敗，伺服器回應：%s"
 
 #: methods/ftp.cc:291
 #, c-format
 msgid "TYPE failed, server said: %s"
-msgstr "『TYPE』指令因『%s』失敗。"
+msgstr "TYPE 指令失敗，伺服器回應：%s"
 
 #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
 msgid "Connection timeout"
@@ -1805,23 +1774,23 @@ msgstr "連線逾時"
 
 #: methods/ftp.cc:335
 msgid "Server closed the connection"
-msgstr "伺服器關閉聯線。"
+msgstr "伺服器已關閉連線"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
 msgid "Read error"
-msgstr "讀取失敗。"
+msgstr "讀取錯誤"
 
 #: methods/ftp.cc:345 methods/rsh.cc:197
 msgid "A response overflowed the buffer."
-msgstr "答覆超過緩衝區長度。"
+msgstr "回應超過緩衝區長度。"
 
 #: methods/ftp.cc:362 methods/ftp.cc:374
 msgid "Protocol corruption"
-msgstr "協定失敗。"
+msgstr "協定失敗"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
 msgid "Write error"
-msgstr "寫入失敗。"
+msgstr "寫入錯誤"
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"
@@ -1829,23 +1798,23 @@ msgstr "無法建立 Socket"
 
 #: methods/ftp.cc:698
 msgid "Could not connect data socket, connection timed out"
-msgstr "無法連接到 data socket，連線逾時"
+msgstr "無法和 data socket 連線，連線逾時"
 
 #: methods/ftp.cc:704
 msgid "Could not connect passive socket."
-msgstr "無法連接到 passive socket"
+msgstr "無法和 passive socket 連線。"
 
 #: methods/ftp.cc:722
 msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo 無法取得監聽的 socket"
+msgstr "getaddrinfo 無法取得監聽 socket"
 
 #: methods/ftp.cc:736
 msgid "Could not bind a socket"
-msgstr "無法連接(bind) socket"
+msgstr "無法 bind 至 socket"
 
 #: methods/ftp.cc:740
 msgid "Could not listen on the socket"
-msgstr "無法在 socket 上接收資料"
+msgstr "無法監聽 socket"
 
 #: methods/ftp.cc:747
 msgid "Could not determine the socket's name"
@@ -1853,17 +1822,17 @@ msgstr "無法解析 socket 名稱"
 
 #: methods/ftp.cc:779
 msgid "Unable to send PORT command"
-msgstr "無法送出「PORT」命令"
+msgstr "無法送出 PORT 指令"
 
 #: methods/ftp.cc:789
 #, c-format
 msgid "Unknown address family %u (AF_*)"
-msgstr "未知的地址成員 %u (AF_*)"
+msgstr "未知的地址家族 %u (AF_*)"
 
 #: methods/ftp.cc:798
 #, c-format
 msgid "EPRT failed, server said: %s"
-msgstr "EPRT 失敗，伺服器回應：%s"
+msgstr "EPRT 指令失敗，伺服器回應：%s"
 
 #: methods/ftp.cc:818
 msgid "Data socket connect timed out"
@@ -1871,16 +1840,16 @@ msgstr "Data socket 連線逾時"
 
 #: methods/ftp.cc:825
 msgid "Unable to accept connection"
-msgstr "無法允許連線"
+msgstr "無法接受連線"
 
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
 msgid "Problem hashing file"
-msgstr "問題雜湊表"
+msgstr "有問題的雜湊檔"
 
 #: methods/ftp.cc:877
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "無法取得檔案，伺服器回應：%s"
+msgstr "無法取得檔案，伺服器回應 '%s'"
 
 #: methods/ftp.cc:892 methods/rsh.cc:322
 msgid "Data socket timed out"
@@ -1889,7 +1858,7 @@ msgstr "Data socket 連線逾時"
 #: methods/ftp.cc:922
 #, c-format
 msgid "Data transfer failed, server said '%s'"
-msgstr "資料傳輸失敗，伺服器回應 %s"
+msgstr "資料傳輸失敗，伺服器回應 '%s'"
 
 #. Get the files information
 #: methods/ftp.cc:997
@@ -1898,12 +1867,12 @@ msgstr "查詢"
 
 #: methods/ftp.cc:1109
 msgid "Unable to invoke "
-msgstr "無法讀取 "
+msgstr "無法 invoke "
 
 #: methods/connect.cc:70
 #, c-format
 msgid "Connecting to %s (%s)"
-msgstr "連絡『%s (%s)』中"
+msgstr "正和 %s (%s) 連線"
 
 #: methods/connect.cc:81
 #, c-format
@@ -1913,86 +1882,86 @@ msgstr "[IP: %s %s]"
 #: methods/connect.cc:90
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "無法建立到『%s』的 socket (族=%u 型=%u 協定=%u)。"
+msgstr "無法建立 socket 指向 %s (f=%u t=%u p=%u)"
 
 #: methods/connect.cc:96
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "無法聯絡到主機『%s:%s (%s)』。"
+msgstr "無法初始和 %s:%s (%s) 的連線。"
 
 #: methods/connect.cc:104
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "無法聯絡到主機『%s:%s (%s)』。"
+msgstr "無法和 %s:%s (%s) 連線，連線逾時"
 
 #: methods/connect.cc:119
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
-msgstr "無法聯絡到主機『%s:%s (%s)』。"
+msgstr "無法和 %s:%s (%s) 連線。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #: methods/connect.cc:147 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
-msgstr "聯絡主機『%s』中"
+msgstr "正連線至 %s"
 
 #: methods/connect.cc:165 methods/connect.cc:184
 #, c-format
 msgid "Could not resolve '%s'"
-msgstr "無法解析位置 %s"
+msgstr "無法解析 '%s'"
 
 #: methods/connect.cc:190
 #, c-format
 msgid "Temporary failure resolving '%s'"
-msgstr "解析『%s』暫時失敗"
+msgstr "暫時無法解析 '%s'"
 
 #: methods/connect.cc:193
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "無法解析『%s:%s (%i)』。"
+msgstr "在解析 '%s:%s' (%i) 時出了怪事"
 
 #: methods/connect.cc:240
 #, c-format
 msgid "Unable to connect to %s %s:"
-msgstr "無法聯絡到主機『%s %s』："
+msgstr "無法連線至 %s %s："
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
-msgstr "無法存取keyring：%s"
+msgstr "無法存取鑰匙圈：'%s'"
 
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "錯誤：Acquire::gpgv::Options 的參數列表超長。結束執行。"
+msgstr "錯誤：Acquire::gpgv::Options 的參數列表過長。結束執行。"
 
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "內部錯誤：簽名正確無誤，但是無法確認密鑰的指紋(key fingerprint)？！"
+msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！"
 
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
-msgstr "至少發現一個無效的簽名。"
+msgstr "至少發現一個無效的簽章。"
 
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
-msgstr "無法執行“%s”來驗證簽名(您安裝了 gpgv 嗎？)"
+msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）"
 
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
-msgstr "執行 gpgv 時發生未知錯誤"
+msgstr "在執行 gpgv 時發生未知的錯誤"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
-msgstr "下列的簽名皆不合法：\n"
+msgstr "以下簽名無效：\n"
 
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
-msgstr "由於沒有公鑰，下列簽名無法進行驗證：\n"
+msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n"
 
 #: methods/gzip.cc:64
 #, c-format
@@ -2002,153 +1971,181 @@ msgstr "無法開啟管線給 %s 使用"
 #: methods/gzip.cc:109
 #, c-format
 msgid "Read error from %s process"
-msgstr "從 %s 進程讀取錯誤"
+msgstr "由 %s 程序讀取錯誤"
 
-#: methods/http.cc:377
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr "等待標頭"
 
-#: methods/http.cc:523
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "取得一個單行超過 %u 字元的標頭"
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Bad header line"
-msgstr "壞的標頭"
+msgstr "標頭行錯誤"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
-msgstr "http 伺服器傳送一個無效的回覆標頭"
+msgstr "HTTP 伺服器傳送了一個無效的回覆標頭"
 
-#: methods/http.cc:586
+#: methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
+msgstr "HTTP 伺服器傳送了一個無效的 Content-Length 標頭"
 
-#: methods/http.cc:601
+#: methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
+msgstr "HTTP 伺服器傳送了一個無效的 Content-Range 標頭"
 
-#: methods/http.cc:603
+#: methods/http.cc:605
 msgid "This HTTP server has broken range support"
-msgstr "http 伺服器有損毀的範圍支援"
+msgstr "這個 HTTP 伺服器的範圍支援有問題"
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr "未知的資料格式"
 
-#: methods/http.cc:774
+#: methods/http.cc:782
 msgid "Select failed"
-msgstr "Select 失敗"
+msgstr "選擇失敗"
 
-#: methods/http.cc:779
+#: methods/http.cc:787
 msgid "Connection timed out"
 msgstr "連線逾時"
 
-#: methods/http.cc:802
+#: methods/http.cc:810
 msgid "Error writing to output file"
-msgstr "寫入輸出檔時發生錯誤"
+msgstr "在寫入輸出檔時發生錯誤"
 
-#: methods/http.cc:833
+#: methods/http.cc:841
 msgid "Error writing to file"
-msgstr "寫入檔案時發生錯誤"
+msgstr "在寫入檔案時發生錯誤"
 
-#: methods/http.cc:861
+#: methods/http.cc:869
 msgid "Error writing to the file"
-msgstr "寫入檔案時發生錯誤"
+msgstr "在寫入該檔時發生錯誤"
 
-#: methods/http.cc:875
+#: methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
-msgstr "從遠端主機讀取錯誤，關閉連線"
+msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線"
 
-#: methods/http.cc:877
+#: methods/http.cc:885
 msgid "Error reading from server"
-msgstr "從伺服器讀取發生錯誤"
+msgstr "在讀取伺服器時發生錯誤"
 
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
-#, fuzzy
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
-msgstr "寫入檔案 %s 失敗"
+msgstr "無法截短檔案"
 
-#: methods/http.cc:1105
+#: methods/http.cc:1141
 msgid "Bad header data"
-msgstr "壞的標頭資料"
+msgstr "錯誤的標頭資料"
 
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/http.cc:1229
+#: methods/http.cc:1305
 msgid "Internal error"
 msgstr "內部錯誤"
 
 #: apt-pkg/contrib/mmap.cc:80
 msgid "Can't mmap an empty file"
-msgstr "不能將空白檔案讀入記憶體"
+msgstr "不能 mmap 空白檔案"
 
 #: apt-pkg/contrib/mmap.cc:85
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
-msgstr "無法讀入檔案 %lu 位元組至記憶體"
+msgstr "無法 mmap 到 %lu 位元組"
 
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。"
+"(man 5 apt.conf)"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1014
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029
 #, c-format
 msgid "Selection %s not found"
-msgstr "選項『%s』找不到。"
+msgstr "選項 %s 找不到"
 
 #: apt-pkg/contrib/configuration.cc:439
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
-msgstr "不認識的簡寫類型：%c"
+msgstr "無法辨識的縮寫類型：'%c'"
 
 #: apt-pkg/contrib/configuration.cc:497
 #, c-format
 msgid "Opening configuration file %s"
-msgstr "開啟組態檔 %s"
+msgstr "開啟設定檔 %s"
 
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "語法錯誤 %s:%u: 區塊沒有名稱"
+msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。"
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr "語法錯誤 %s:%u: 無效的標籤"
+msgstr "語法錯誤 %s:%u：標籤格式錯誤"
 
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "語法錯誤 %s:%u: 值後有多餘的垃圾"
+msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾"
 
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "語法錯誤： %s:%u： 指令只能於最高層級執行"
+msgstr "語法錯誤 %s:%u：指令只能於最高層級執行"
 
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "語法錯誤 %s:%u: 太多重複引入檔案"
+msgstr "語法錯誤 %s:%u: 太多巢狀引入檔"
 
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "語法錯誤 %s:%u: 從此引入"
+msgstr "語法錯誤 %s:%u：從此引入"
 
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'"
+msgstr "語法錯誤 %s:%u：不支援的指令 '%s'"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾"
+msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾"
 
 #: apt-pkg/contrib/progress.cc:153
 #, c-format
@@ -2163,7 +2160,7 @@ msgstr "%c%s... 完成"
 #: apt-pkg/contrib/cmndline.cc:77
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "未知的命令列選項「%c」從 %s"
+msgstr "未知的命令列選項 '%c' [來自 %s]。"
 
 #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
 #: apt-pkg/contrib/cmndline.cc:119
@@ -2174,22 +2171,22 @@ msgstr "無法理解的命令列選項 %s"
 #: apt-pkg/contrib/cmndline.cc:124
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "命令列選項 %s 不是布林(boolean)變數"
+msgstr "命令列選項 %s 不是 boolean 值"
 
 #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
 #, c-format
 msgid "Option %s requires an argument."
-msgstr "選項 %s 需要更多的參數"
+msgstr "需替選項 %s 指定參數。"
 
 #: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "選項 %s： 組態元件描述應該有 =<val>"
+msgstr "選項 %s：在指定設定項目時應該有 =<val>。"
 
 #: apt-pkg/contrib/cmndline.cc:234
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
-msgstr "選項 %s 需要整數參數，不是 %s"
+msgstr "選項 %s 的參數應該是數字，而不是 '%s'"
 
 #: apt-pkg/contrib/cmndline.cc:265
 #, c-format
@@ -2199,253 +2196,263 @@ msgstr "選項 %s 太長"
 #: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
-msgstr "偵測器 %s 無法理解，試試 true 或 false"
+msgstr "偵測器 %s 無法理解，試試 true 或 false。"
 
 #: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
-msgstr "無效的操作：%s"
+msgstr "無效的操作 %s"
 
 #: apt-pkg/contrib/cdromutl.cc:52
 #, c-format
 msgid "Unable to stat the mount point %s"
-msgstr "無法讀取掛載點 %s"
+msgstr "無法取得掛載點 %s 的狀態"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 #, c-format
 msgid "Unable to change to %s"
-msgstr "無法進入『%s』目錄。"
+msgstr "無法切換至 %s"
 
 #: apt-pkg/contrib/cdromutl.cc:188
 msgid "Failed to stat the cdrom"
-msgstr "CD-ROM 狀況讀取失敗"
+msgstr "無法取得 CD-ROM 的狀態"
 
 #: apt-pkg/contrib/fileutl.cc:149
 #, c-format
 msgid "Not using locking for read only lock file %s"
-msgstr "不使用檔案鎖定於唯獨檔案 %s"
+msgstr "不在唯讀檔案 %s 上使用檔案鎖定"
 
 #: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Could not open lock file %s"
-msgstr "無法開啟『%s』鎖定檔。"
+msgstr "無法開啟鎖定檔 %s"
 
 #: apt-pkg/contrib/fileutl.cc:172
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr "不使用檔案鎖定於 nfs 掛載點上得檔案 %s"
+msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定"
 
 #: apt-pkg/contrib/fileutl.cc:176
 #, c-format
 msgid "Could not get lock %s"
-msgstr "無法取得『%s』鎖。"
+msgstr "無法將 %s 鎖定"
 
 #: apt-pkg/contrib/fileutl.cc:444
 #, c-format
 msgid "Waited for %s but it wasn't there"
-msgstr "等待 %s 但是它不存在"
+msgstr "等待 %s 但是它並不存在"
 
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
-msgstr "子程序 %s 收到一個記憶體錯誤"
+msgstr "子程序 %s 收到一個記憶體錯誤。"
 
 #: apt-pkg/contrib/fileutl.cc:457
+#, fuzzy, c-format
+#| msgid "Sub-process %s received a segmentation fault."
+msgid "Sub-process %s received signal %u."
+msgstr "子程序 %s 收到一個記憶體錯誤。"
+
+#: apt-pkg/contrib/fileutl.cc:460
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
-msgstr "子程序 %s 回傳錯誤碼(%u)"
+msgstr "子程序 %s 傳回錯誤碼 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "子程序 %s 不預期的結束"
+msgstr "子程序 %s 不預期得結束"
 
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "Could not open file %s"
-msgstr "無法開啟『%s』檔案。"
+msgstr "無法開啟檔案 %s"
 
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562
 #, c-format
 msgid "read, still have %lu to read but none left"
-msgstr "讀取，仍有 %lu 未讀"
+msgstr "讀取，仍有 %lu 未讀但已無空間"
 
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592
 #, c-format
 msgid "write, still have %lu to write but couldn't"
-msgstr "寫入，仍有 %lu 待寫入但無法寫入"
+msgstr "寫入，仍有 %lu 待寫入但已沒辨法"
 
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667
 msgid "Problem closing the file"
-msgstr "程式關閉檔案"
+msgstr "在關閉檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673
 msgid "Problem unlinking the file"
-msgstr "程式刪除檔案"
+msgstr "在刪除檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684
 msgid "Problem syncing the file"
-msgstr "程式同步檔案"
+msgstr "在同步檔案時發生問題"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
-msgstr "套件暫存檔是空的。"
+msgstr "清空套件快取"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
-msgstr "套件暫存檔損壞。"
+msgstr "套件快取檔損壞"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
-msgstr "套件暫存檔版本不符合。"
+msgstr "套件快取檔版本不符"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr "本軟體不支持『%s』版本系統。"
+msgstr "本 APT 不支援 '%s' 版本系統"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
-msgstr "套件暫存檔是在另一種系統上產生的。"
+msgstr "這個套件快取是用於另一種平台的"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
-msgstr "依存關係"
+msgstr "相依關係"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
-msgstr "特別依存關係"
+msgstr "預先相依關係"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
 msgstr "建議"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
 msgstr "推薦"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
 msgstr "衝突"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
 msgstr "取代"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
-msgstr "淘汰"
+msgstr "廢棄"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
-msgstr "Breaks"
+msgstr "毀損"
+
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
 msgstr "必要"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
 msgstr "次要"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
-msgstr "添加"
+msgstr "額外"
 
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
-msgstr "了解套件依存關係中"
+msgstr "正在重建相依關係"
 
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
 msgstr "候選版本"
 
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
-msgstr "產生套件依存關係"
+msgstr "建立相依關係"
 
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
-msgstr "讀取狀態資料中"
+msgstr "正在讀取狀態資料"
 
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221
 #, c-format
 msgid "Failed to open StateFile %s"
-msgstr "無法開啟狀態檔案%s"
+msgstr "無法開啟 StateFile %s"
 
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227
 #, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr "寫入暫存的狀態檔案 %s 失敗"
+msgstr "無法寫入暫存的 StateFile %s"
 
 #: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (1)"
-msgstr "無法辨識套件『%s』(1)。"
+msgstr "無法辨識套件檔 %s (1)"
 
 #: apt-pkg/tagfile.cc:189
 #, c-format
 msgid "Unable to parse package file %s (2)"
-msgstr "無法辨識套件『%s』(1)。"
+msgstr "無法辨識套件檔 %s (2)"
 
 #: apt-pkg/sourcelist.cc:90
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號)。"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)"
 
 #: apt-pkg/sourcelist.cc:92
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本)。"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）"
 
 #: apt-pkg/sourcelist.cc:95
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號分辨)。"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）"
 
 #: apt-pkg/sourcelist.cc:101
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）"
 
 #: apt-pkg/sourcelist.cc:108
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
 
 #: apt-pkg/sourcelist.cc:199
 #, c-format
 msgid "Opening %s"
-msgstr "開啟『%s』中"
+msgstr "正在開啟 %s"
 
 #: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
 #, c-format
 msgid "Line %u too long in source list %s."
-msgstr "來源檔『%2$s』第 %1$u 行太長。"
+msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
 
 #: apt-pkg/sourcelist.cc:236
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。"
+msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）"
 
 #: apt-pkg/sourcelist.cc:240
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行"
+msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
 
 #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。"
+msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（提供者 ID）"
 
 #: apt-pkg/packagemanager.cc:428
 #, c-format
@@ -2454,250 +2461,271 @@ msgid ""
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
-"此安裝因衝突或特別依存關係，需暫時刪除『%s』這個重要套件。這種情形通常有問"
-"題，但您確定的話請啟動『APT::Force-LoopBreak』選項。"
+"此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但"
+"若您執意進行，請設定 APT::Force-LoopBreak 選項。"
 
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
-msgstr "本軟體不支持『%s』型的索引檔。"
+msgstr "不被支援的索引檔類型 '%s'"
 
 #: apt-pkg/algorithms.cc:248
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。"
+msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。"
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1154
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
-msgstr "無法解決依存關係。可能原因是某些套件被押後。"
+msgstr ""
+"錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套"
+"件。"
 
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1156
 msgid "Unable to correct problems, you have held broken packages."
-msgstr "無法解決問題，因為某些損毀的套件被押後。"
+msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
 
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
-msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。"
+msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。"
 
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
-msgstr "找不到『%spartial』清單目錄。"
+msgstr "找不到清單目錄 %spartial。"
 
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
-msgstr "找不到『%spartial』檔案目錄。"
+msgstr "找不到套件檔目錄 %spartial。"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在下載第 %li 個文件(共 %li 個，尚需 %s)"
+msgstr "正在取得檔案 %li/%li（還有 %s）"
 
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
-msgstr "正在下載第%li個檔案(共有%li)"
+msgstr "正在取得檔案 %li/%li"
 
 #: apt-pkg/acquire-worker.cc:110
 #, c-format
 msgid "The method driver %s could not be found."
-msgstr "找不到安裝方式『%s』的驅動程式。"
+msgstr "找不到安裝方式的驅動程式 %s。"
 
 #: apt-pkg/acquire-worker.cc:159
 #, c-format
 msgid "Method %s did not start correctly"
-msgstr "安裝方式『%s』沒有正確啟動。"
+msgstr "安裝方式 %s 沒有正確啟動"
 
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "更換媒體：請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。"
+msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
 
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
-msgstr "本軟體不支持『%s』包裝法。"
+msgstr "不支援的套件包裝系統 '%s'"
 
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
-msgstr "無法明白系統類別。"
+msgstr "無法確認合適的套件包裝系統類型"
 
 #: apt-pkg/clean.cc:57
 #, c-format
 msgid "Unable to stat %s."
-msgstr "無法讀取『%s』的目錄資料。"
+msgstr "無法取得 %s 的狀態。"
 
 #: apt-pkg/srcrecords.cc:44
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "『sources.list』檔中必須有一些『source』指令。"
+msgstr "在 sources.list 中必須包含一些 'source' URI"
 
 #: apt-pkg/cachefile.cc:71
 msgid "The package lists or status file could not be parsed or opened."
-msgstr "無法讀取套件清單或狀況檔。"
+msgstr "無法分析或開啟套件清單或狀況檔。"
 
 #: apt-pkg/cachefile.cc:75
 msgid "You may want to run apt-get update to correct these problems"
-msgstr "用『apt-get -f install』指令或許能修正這些問題。"
+msgstr "您也許得執行 apt-get update 以修正這些問題"
 
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
-msgstr "喜好檔有錯誤—缺少套件前置檔。"
+#: apt-pkg/policy.cc:329
+#, fuzzy, c-format
+#| msgid "Invalid record in the preferences file, no Package header"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭"
 
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr "本軟體不支持『%s』型的版本釘子。"
+msgstr "無法分析鎖定類型 %s"
 
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359
 msgid "No priority (or zero) specified for pin"
-msgstr "對於釘住的檔案無優先順序"
+msgstr "銷定並沒有優先順序之分（或零）"
 
 #: apt-pkg/pkgcachegen.cc:72
 msgid "Cache has an incompatible versioning system"
-msgstr "套件暫存檔使用的是不相容的版本系統。"
+msgstr "快取使用的是不相容的版本系統"
 
 #: apt-pkg/pkgcachegen.cc:115
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
-msgstr "處理『%s』時發生錯誤 (NewPackage)。"
+msgstr "在處理 %s 時發生錯誤 (NewPackage)"
 
 #: apt-pkg/pkgcachegen.cc:130
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "處理『%s』時發生錯誤 (UsePackage1)。"
+msgstr "在處理 %s 時發生錯誤 (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:164
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "處理『%s』時發生錯誤 (NewFileDesc1)。"
+msgstr "在處理 %s 時發生錯誤 (NewFileDesc1)"
 
 #: apt-pkg/pkgcachegen.cc:189
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "處理『%s』時發生錯誤 (UsePackage2)。"
+msgstr "在處理 %s 時發生錯誤 (UsePackage2)"
 
 #: apt-pkg/pkgcachegen.cc:193
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
+msgstr "在處理 %s 時發生錯誤 (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:224
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "處理『%s』時發生錯誤 (NewVersion1)。"
+msgstr "在處理 %s 時發生錯誤 (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:228
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "處理『%s』時發生錯誤 (UsePackage3)。"
+msgstr "在處理 %s 時發生錯誤 (UsePackage3)"
 
 #: apt-pkg/pkgcachegen.cc:232
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "處理『%s』時發生錯誤 (NewVersion2)。"
+msgstr "在處理 %s 時發生錯誤 (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:256
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "處理『%s』時發生錯誤 (NewFileDesc2)。"
+msgstr "在處理 %s 時發生錯誤 (NewFileDesc2)"
 
 #: apt-pkg/pkgcachegen.cc:262
 msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "套件數量超過本程式的能力。"
+msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
 
 #: apt-pkg/pkgcachegen.cc:265
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "套件版本數量超過本程式的能力。"
+msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
 
 #: apt-pkg/pkgcachegen.cc:268
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇，套件版本數量超過該 APT 的能力。"
+msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
 
 #: apt-pkg/pkgcachegen.cc:271
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "依存關係數量超過本程式的能力。"
+msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
 
 #: apt-pkg/pkgcachegen.cc:299
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
-msgstr "處理『%s』時發生錯誤 (FindPkg)。"
+msgstr "在處理 %s 時發生錯誤 (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:312
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。"
+msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)"
 
 #: apt-pkg/pkgcachegen.cc:318
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
-msgstr "當計算相依性時找不到套件 %s %s "
+msgstr "在計算檔案相依性時找不到套件 %s %s"
 
 #: apt-pkg/pkgcachegen.cc:690
 #, c-format
 msgid "Couldn't stat source package list %s"
-msgstr "無法讀取來源檔『%s』的目錄資料。"
+msgstr "無法取得來源套件列表 %s 的狀態"
 
 #: apt-pkg/pkgcachegen.cc:775
 msgid "Collecting File Provides"
-msgstr "收集檔案供應"
+msgstr "正在收集檔案提供者"
 
 #: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
 msgid "IO Error saving source cache"
-msgstr "無法寫入來源暫存檔。"
+msgstr "在儲存來源快取時 IO 錯誤"
 
 #: apt-pkg/acquire-item.cc:127
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
-msgstr "檔名因『%s』更換失敗 (%s → %s)。"
+msgstr "無法重新命名，%s (%s -> %s)。"
 
 #: apt-pkg/acquire-item.cc:401
 msgid "MD5Sum mismatch"
-msgstr "MD5 檢查碼不符合。"
+msgstr "MD5Sum 不符"
 
 #: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
 msgid "Hash Sum mismatch"
-msgstr "檢查碼不符合。"
+msgstr "Hash Sum 不符"
 
 #: apt-pkg/acquire-item.cc:1118
 msgid "There is no public key available for the following key IDs:\n"
-msgstr "以下 key ID 沒有可用的公鑰：\n"
+msgstr "無法取得以下的密鑰 ID 的公鑰：\n"
 
 #: apt-pkg/acquire-item.cc:1231
 #, 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』需要的某檔案。請您修理這個套件再試試。"
+msgstr ""
+"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平"
+"台）"
 
 #: apt-pkg/acquire-item.cc:1290
 #, 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』需要的某檔案。請您修理這個套件再試試。"
+msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。"
 
 #: apt-pkg/acquire-item.cc:1331
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
-msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
+msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
 
 #: apt-pkg/acquire-item.cc:1418
 msgid "Size mismatch"
-msgstr "檔案大小不符合。"
+msgstr "大小不符"
+
+#: apt-pkg/indexrecords.cc:40
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "無法辨別 Release 檔 %s"
+
+#: apt-pkg/indexrecords.cc:47
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有區段"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
-msgstr "廠商區段%s有錯誤。"
+msgstr "提供者區塊 %s 沒有包含指紋碼"
 
 #: apt-pkg/cdrom.cc:529
 #, c-format
@@ -2706,20 +2734,20 @@ msgid ""
 "Mounting CD-ROM\n"
 msgstr ""
 "使用光碟機掛載點 %s\n"
-"掛載光碟機中\n"
+"正在掛載光碟機\n"
 
 #: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
 msgid "Identifying.. "
-msgstr "標識中.."
+msgstr "正在識別.."
 
 #: apt-pkg/cdrom.cc:563
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "保存標誌：%s \n"
+msgstr "保存標籤：%s\n"
 
 #: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
 msgid "Unmounting CD-ROM...\n"
-msgstr "卸載光碟機中...\n"
+msgstr "正在卸載光碟機...\n"
 
 #: apt-pkg/cdrom.cc:590
 #, c-format
@@ -2728,36 +2756,42 @@ msgstr "使用光碟機掛載點 %s\n"
 
 #: apt-pkg/cdrom.cc:608
 msgid "Unmounting CD-ROM\n"
-msgstr "卸載光碟機中\n"
+msgstr "正在卸載光碟機\n"
 
 #: apt-pkg/cdrom.cc:612
 msgid "Waiting for disc...\n"
-msgstr "等待磁碟中...\n"
+msgstr "正在等待碟片...\n"
 
 #. Mount the new CDROM
 #: apt-pkg/cdrom.cc:620
 msgid "Mounting CD-ROM...\n"
-msgstr "掛載光碟機中... \n"
+msgstr "正在掛載光碟機... \n"
 
 #: apt-pkg/cdrom.cc:638
 msgid "Scanning disc for index files..\n"
-msgstr "掃描碟片中的索引檔案..\n"
+msgstr "正在掃描碟片中的索引檔..\n"
 
 #: apt-pkg/cdrom.cc:678
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
 "zu signatures\n"
-msgstr "找到 %zu 個套件索引，%zu 原始碼索引，%zu 翻譯索引和%zu 簽名\n"
+msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯索引及 %zu 個簽章\n"
+
+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
 
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
-msgstr "發現標誌 %s \n"
+msgstr "找到標籤 '%s'\n"
 
 #: apt-pkg/cdrom.cc:744
 msgid "That is not a valid name, try again.\n"
-msgstr "這不是合法名稱，重試一下。\n"
+msgstr "這並不是正確的名稱，請重試。\n"
 
 #: apt-pkg/cdrom.cc:760
 #, c-format
@@ -2770,163 +2804,148 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:764
 msgid "Copying package lists..."
-msgstr "複製套件清單中"
+msgstr "正在複製套件清單..."
 
 #: apt-pkg/cdrom.cc:790
 msgid "Writing new source list\n"
-msgstr "寫入新的來源列表中\n"
+msgstr "正在寫入新的來源列表\n"
 
 #: apt-pkg/cdrom.cc:799
 msgid "Source list entries for this disc are:\n"
 msgstr "該碟片的來源列表項目為：\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "寫入 %i 筆紀錄。\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
-msgstr "寫入 %i 筆遺失 %i 個檔案的紀錄。\n"
+msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
-msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n"
+msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"
+msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n"
 
 #: apt-pkg/deb/dpkgpm.cc:49
-#, fuzzy, c-format
+#, c-format
 msgid "Installing %s"
-msgstr "已安裝%s"
+msgstr "正在安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
 #, c-format
 msgid "Configuring %s"
-msgstr "設定%s中"
+msgstr "正在設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Removing %s"
-msgstr "移除%s中"
+msgstr "正在移除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Running post-installation trigger %s"
-msgstr ""
+msgstr "正在執行安裝後套件後續處理程式 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:546
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "找不到 '%s' 目錄"
 
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:635
 #, c-format
 msgid "Preparing %s"
-msgstr "準備配置%s中"
+msgstr "正在準備 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:636
 #, c-format
 msgid "Unpacking %s"
-msgstr "解開%s中"
+msgstr "正在解開 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing to configure %s"
-msgstr "準備設定%s檔"
-
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "處理 %s 的啟動器"
+msgstr "正在準備設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Installed %s"
-msgstr "已安裝%s"
+msgstr "已安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:648
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr "正在準備 %s 的刪除操作"
+msgstr "正在準備移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Removed %s"
-msgstr "已移除%s"
+msgstr "已移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Preparing to completely remove %s"
-msgstr "準備完整移除 %s"
+msgstr "正在準備完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:656
 #, c-format
 msgid "Completely removed %s"
-msgstr "已完整移除%s"
+msgstr "已完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:820
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr "無法寫入記錄檔，openpty()失敗(/dev/pts有掛載嗎？)\n"
+msgstr "無法寫入記錄檔，openpty() 失敗（/dev/pts 未掛載？）\n"
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "無法開啟『%s』檔案。"
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "連線不預期的結束"
-
-#~ msgid ""
-#~ "Since you only requested a single operation it is extremely likely that\n"
-#~ "the package is simply not installable and a bug report against\n"
-#~ "that package should be filed."
-#~ msgstr ""
-#~ "您僅要求對單一套件進行操作,這極有可能是因為\n"
-#~ "該套件無法安裝,您最好提交一個針對這個套件\n"
-#~ "的臭蟲報告。"
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "第 %d 行太長（最長 %d）"
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Line %d too long (max %d)"
-#~ msgstr "第 %d 行太長（最長 %d）"
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+#| msgid "Unable to lock the list directory"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "無法鎖定列表目錄"
 
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc1)"
-#~ msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc2)"
-#~ msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Stored label: %s \n"
-#~ msgstr "保存標誌：%s \n"
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "無法修補檔案"
 
-#, fuzzy
-#~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
-#~ msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n"
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "連線突然終止"
 
-#, fuzzy
-#~ msgid "openpty failed\n"
-#~ msgstr "Select 失敗"
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
 
-#~ msgid "File date has changed %s"
-#~ msgstr "檔案資料已更改 %s"
+#~ msgid "Processing triggers for %s"
+#~ msgstr "正在進行 %s 的觸發程式"
 
-#~ msgid "Reading file list"
-#~ msgstr "讀取軟件表中"
+#~ msgid "Release file expired, ignoring %s (valid until %s)"
+#~ msgstr "Release 檔已過期，略過 %s（有效期限 %s）"
 
-#~ msgid "Could not execute "
-#~ msgstr "無法取得『%s』鎖。"
+#~ msgid "Conflicting distribution: %s (expected %s but got %s)"
+#~ msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）"
diff --git a/test/makefile b/test/makefile
index a9dbdc34d..fb9123d0a 100644
--- a/test/makefile
+++ b/test/makefile
@@ -68,6 +68,12 @@ SLIBS = -lapt-pkg
 SOURCE = hash.cc
 include $(PROGRAM_H)
 
+# Program for testing udevcdrom
+PROGRAM=test_udevcdrom
+SLIBS = -lapt-pkg 
+SOURCE = test_udevcdrom.cc
+include $(PROGRAM_H)
+
 # Program for checking rpm versions
 PROGRAM=rpmver
 SLIBS = -lapt-pkg -lrpm
diff --git a/test/test_udevcdrom.cc b/test/test_udevcdrom.cc
new file mode 100644
index 000000000..e65c7a297
--- /dev/null
+++ b/test/test_udevcdrom.cc
@@ -0,0 +1,19 @@
+#include <apt-pkg/cdrom.h>
+#include <stdio.h>
+#include <assert.h>
+
+int main()
+{
+   int i;
+   pkgUdevCdromDevices c;
+   assert(c.Dlopen());
+
+   vector<CdromDevice> l;
+   l = c.Scan();
+   assert(l.size() > 0);
+   for (i=0;i<l.size();i++)
+      std::cerr << l[i].DeviceName << " " 
+		<< l[i].Mounted << " " 
+		<< l[i].MountPath << std::endl;
+   
+}